Changeset f8d99e9 in rtems-libbsd

Timestamp:

12/20/13 14:34:57 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

b6c319b

Parents:

0073528

git-author:

Sebastian Huber <sebastian.huber@…> (12/20/13 14:34:57)

git-committer:

Sebastian Huber <sebastian.huber@…> (12/20/13 14:35:59)

Message:

Fix install Makefile target

Files:

• Makefile (modified) (1 diff)
• config.inc (modified) (1 diff)
• freebsd-to-rtems.py (modified) (1 diff)

Makefile

@@ -1311 +1311 @@
 CPU_SED += -e '/sparc64/d'
 
+LIB_DIR = $(INSTALL_BASE)/lib
+INCLUDE_DIR = $(INSTALL_BASE)/lib/include
+
 install: $(LIB)
-        install -d $(INSTALL_BASE)/include
-        install -c -m 644 $(LIB) $(INSTALL_BASE)
-        cd rtemsbsd; for i in `find freebsd -name '*.h'` ; do \
-          install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-        cd contrib/altq; for i in `find freebsd -name '*.h'` ; do \
-          install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-        cd contrib/pf; for i in `find freebsd -name '*.h'` ; do \
-          install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-        for i in `find freebsd -name '*.h' | $(CPU_SED)` ; do \
-          install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-        -cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name '*.h'` ; do \
-          install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-        -cd rtemsbsd/$(RTEMS_CPU)/include && \
-          for i in `find . -name '*.h' | $(CPU_SED)` ; do \
-            install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-        -cd copied/rtemsbsd/$(RTEMS_CPU)/include && for i in `find . -name '*.h'` ; do \
-          install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
+        install -d $(LIB_DIR)
+        install -m 644 $(LIB) $(LIB_DIR)
+        cd rtemsbsd/include ; for i in `find . -type d` ; do \
+          install -d $(INCLUDE_DIR)/$$i ; \
+          install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done
+        cd freebsd/include ; for i in `find . -type d` ; do \
+          install -d $(INCLUDE_DIR)/$$i ; \
+          install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done
+        for i in bsm cam net net80211 netatalk netinet netinet6 netipsec sys ; do \
+          install -d $(INCLUDE_DIR)/$$i ; \
+          install -m 644 freebsd/sys/$$i/*.h $(INCLUDE_DIR)/$$i ; done
 
 clean:

config.inc

@@ -5 +5 @@
 
 # Optional: Separate installation base directory
-INSTALL_BASE = $(PREFIX)
+INSTALL_BASE = $(PREFIX)/$(TARGET)/$(BSP)
 
 # Optional: Network test configuration

freebsd-to-rtems.py

@@ -500 +500 @@
                         'CPU_SED += -e \'/sparc64/d\'\n' \
                         '\n' \
+                        'LIB_DIR = $(INSTALL_BASE)/lib\n' \
+                        'INCLUDE_DIR = $(INSTALL_BASE)/lib/include\n' \
+                        '\n' \
                         'install: $(LIB)\n' \
-                        '\tinstall -d $(INSTALL_BASE)/include\n' \
-                        '\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \
-                        '\tcd rtemsbsd; for i in `find freebsd -name \'*.h\'` ; do \\\n' \
-                        '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
-                        '\tcd contrib/altq; for i in `find freebsd -name \'*.h\'` ; do \\\n' \
-                        '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
-                        '\tcd contrib/pf; for i in `find freebsd -name \'*.h\'` ; do \\\n' \
-                        '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
-                        '\tfor i in `find freebsd -name \'*.h\' | $(CPU_SED)` ; do \\\n' \
-                        '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
-                        '\t-cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name \'*.h\'` ; do \\\n' \
-                        '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
-                        '\t-cd rtemsbsd/$(RTEMS_CPU)/include && \\\n' \
-                        '\t  for i in `find . -name \'*.h\' | $(CPU_SED)` ; do \\\n' \
-                        '\t    install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
-                        '\t-cd copied/rtemsbsd/$(RTEMS_CPU)/include && for i in `find . -name \'*.h\'` ; do \\\n' \
-                        '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
+                        '\tinstall -d $(LIB_DIR)\n' \
+                        '\tinstall -m 644 $(LIB) $(LIB_DIR)\n' \
+                        '\tcd rtemsbsd/include ; for i in `find . -type d` ; do \\\n' \
+                        '\t  install -d $(INCLUDE_DIR)/$$i ; \\\n' \
+                        '\t  install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done\n' \
+                        '\tcd freebsd/include ; for i in `find . -type d` ; do \\\n' \
+                        '\t  install -d $(INCLUDE_DIR)/$$i ; \\\n' \
+                        '\t  install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done\n' \
+                        '\tfor i in bsm cam net net80211 netatalk netinet netinet6 netipsec sys ; do \\\n' \
+                        '\t  install -d $(INCLUDE_DIR)/$$i ; \\\n' \
+                        '\t  install -m 644 freebsd/sys/$$i/*.h $(INCLUDE_DIR)/$$i ; done\n' \
                         '\n' \
                         'clean:\n' \