r6547 - glibc-package/branches/glibc-2.21/debian/rules.d
Author: aurel32
Date: 2015-09-10 08:30:42 +0000 (Thu, 10 Sep 2015)
New Revision: 6547
Modified:
glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
Log:
Replace a few sed and perl calls into a single sed call
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:08:59 UTC (rev 6546)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-09-10 08:30:42 UTC (rev 6547)
@@ -157,15 +157,16 @@
$(stamp)debhelper-common:
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
y=debian/`basename $$x`; \
- cp $$x $$y; \
- sed -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" -i $$y; \
- sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
- sed -e "s#BUILD-TREE#$(build-tree)#" -i $$y; \
- sed -e "s#LIBC#$(libc)#" -i $$y; \
- sed -e "s#EXIT_CHECK##" -i $$y; \
- sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$y; \
- sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$y; \
- sed -e "/NOHWCAP/r debian/script.in/nohwcap.sh" -i $$y; \
+ sed -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) \
sed -e "s/^#.*//" -i $$y ; \
@@ -175,9 +176,6 @@
esac; \
done
- # Substitute __PROVIDED_LOCALES__.
- perl -i -pe 'BEGIN {undef $$/; open(IN, "debian/tmp-libc/usr/share/i18n/SUPPORTED"); $$j=<IN>;} s/__PROVIDED_LOCALES__/$$j/g;' debian/locales.config debian/locales.postinst
-
# Generate common substvars files.
: > tmp.substvars
ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
Reply to: