[Glibc-bsd-commits] r1362 - in trunk/libbsd: . debian

[Robert Millan]

Author: rmh
Date: 2006-03-19 11:12:07 +0000 (Sun, 19 Mar 2006)
New Revision: 1362

Modified:
   trunk/libbsd/Makefile
   trunk/libbsd/debian/libbsd-dev.install
Log:
Fix install paths so that /usr/include also works.

Modified: trunk/libbsd/Makefile
===================================================================
--- trunk/libbsd/Makefile	2006-03-19 10:50:43 UTC (rev 1361)
+++ trunk/libbsd/Makefile	2006-03-19 11:12:07 UTC (rev 1362)
@@ -10,7 +10,6 @@
 
 LIB_INCLUDES := bsd/err.h bsd/getopt.h bsd/ip_icmp.h bsd/random.h bsd/queue.h bsd/md5.h bsd/string.h \
 		bsd/bsd.h bsd/cdefs.h bsd/stdlib.h vis.h
-LIB_INCLUDES := $(patsubst %,include/%,$(LIB_INCLUDES))
 
 LIB_MANS := arc4random.3 strlcpy.3 fgetln.3 fmtcheck.3
 LIB_MANS := $(patsubst %,man/%,$(LIB_MANS))
@@ -59,7 +58,7 @@
 	mkdir -p $(DESTDIR)/usr/share/man/man3
 	install -m644 $(LIB_STATIC) $(DESTDIR)/usr/lib/
 	install -m644 $(LIB_SHARED) $(DESTDIR)/usr/lib/
-	install -m644 $(LIB_INCLUDES) $(DESTDIR)/usr/include/bsd/
+	for i in $(LIB_INCLUDES) ; do install -m644 include/$$i $(DESTDIR)/usr/include/$$i ; done
 	install -m644 $(LIB_MANS) $(DESTDIR)/usr/share/man/man3
 	cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SHARED_SO)
 	cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SONAME)

Modified: trunk/libbsd/debian/libbsd-dev.install
===================================================================
--- trunk/libbsd/debian/libbsd-dev.install	2006-03-19 10:50:43 UTC (rev 1361)
+++ trunk/libbsd/debian/libbsd-dev.install	2006-03-19 11:12:07 UTC (rev 1362)
@@ -1,4 +1,4 @@
 usr/lib/*.so
 usr/lib/*.a
-usr/include/bsd
+usr/include
 usr/share/man