Author: aurel32
Date: 2015-09-10 08:33:49 +0000 (Thu, 10 Sep 2015)
New Revision: 6548

Modified:
   glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
Log:
debhelper.mk: include files before doing any value replacement


Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk       
2015-09-10 08:30:42 UTC (rev 6547)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk       
2015-09-10 08:33:49 UTC (rev 6548)
@@ -157,15 +157,15 @@
 $(stamp)debhelper-common: 
        for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
          y=debian/`basename $$x`; \
-         sed -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" \
+         sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" \
+             -e "/NOHWCAP/r debian/script.in/nohwcap.sh" \
+             -e "/__PROVIDED_LOCALES__/r 
debian/tmp-libc/usr/share/i18n/SUPPORTED" \
+             -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" \
              -e "s#CURRENT_VER#$(DEB_VERSION)#" \
              -e "s#BUILD-TREE#$(build-tree)#" \
              -e "s#LIBC#$(libc)#" \
              -e "s#EXIT_CHECK##" \
              -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" \
-             -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" \
-             -e "/NOHWCAP/r debian/script.in/nohwcap.sh" \
-             -e "/__PROVIDED_LOCALES__/r 
debian/tmp-libc/usr/share/i18n/SUPPORTED" \
              $$x > $$y ; \
          case $$y in \
            *.install) \

Reply via email to