[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r895 - in glibc-package/branches/glibc-2.3.4/debian: . rules.d



Author: gotom
Date: 2005-04-16 18:51:22 +0000 (Sat, 16 Apr 2005)
New Revision: 895

Modified:
   glibc-package/branches/glibc-2.3.4/debian/changelog
   glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk
Log:
    * Support libc6-dev NPTL headers into /usr/include/nptl:
      - debian/rules.d/build.mk: Add include file installation code.
        (Closes: #279423)



Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog	2005-04-16 16:17:22 UTC (rev 894)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog	2005-04-16 18:51:22 UTC (rev 895)
@@ -32,6 +32,10 @@
         work on (ex:) install architecture: i386, kernel architecture: amd64.
       - debian/debhelper.in/libc.postrm: Likewise.
 
+    * Support libc6-dev NPTL headers into /usr/include/nptl:
+      - debian/rules.d/build.mk: Add include file installation code.
+        (Closes: #279423)
+
  -- GOTO Masanori <gotom@debian.org>  Sun, 10 Apr 2005 14:02:19 +0900
 
 glibc (2.3.4-3) experimental; urgency=low

Modified: glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk	2005-04-16 16:17:22 UTC (rev 894)
+++ glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk	2005-04-16 18:51:22 UTC (rev 895)
@@ -86,5 +86,18 @@
 	  (cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
 	fi
 
+	# /usr/lib/nptl and /usr/include/nptl.  It assumes tmp-libc is already installed.
+	if [ $(curpass) = nptl ]; then \
+	  for file in `find debian/tmp-$(curpass)/usr/include -type f | sed 's/^debian\/tmp-nptl\///'`; do \
+	    if ! [ -f debian/tmp-$(curpass)/$$file ] || \
+	       ! cmp -s debian/tmp-$(curpass)/$$file debian/tmp-libc/$$file; then \
+	      target=`echo $$file | sed 's/^usr\/include\///'`; \
+	      install -d `dirname debian/tmp-libc/usr/include/nptl/$$target`; \
+	      install -m 644 debian/tmp-$(curpass)/usr/include/$$target \
+			     debian/tmp-libc/usr/include/nptl/$$target; \
+	    fi; \
+	  done; \
+	fi
+
 	$(call xx,extra_install)
 	touch $@



Reply to: