[dpkg] 20/187: build: Use two space indentation for shell code
Reiner Herrmann
reiner at reiner-h.de
Sun Nov 6 12:46:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
deki-guest pushed a commit to branch master
in repository dpkg.
commit 618fdf4242eae14949d0896e98dce20d3f2a0ceb
Author: Guillem Jover <guillem at debian.org>
Date: Sun Oct 9 17:37:23 2016 +0200
build: Use two space indentation for shell code
---
Makefile.am | 16 +++++++-------
dselect/Makefile.am | 8 +++----
dselect/methods/Makefile.am | 4 ++--
man/Makefile.am | 52 +++++++++++++++++++++------------------------
scripts/Makefile.am | 38 ++++++++++++++++-----------------
scripts/mk/Makefile.am | 6 +++---
6 files changed, 59 insertions(+), 65 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4911b61..7545120 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,14 +179,14 @@ update-po:
dist-hook:
echo $(VERSION) >$(distdir)/.dist-version
if [ -e .git ]; then \
- for file in `git ls-files | grep -v .gitignore`; do \
- if [ ! -e "$(distdir)/$$file" ]; then \
- echo "$$file is missing in $(distdir)" >&2 ; \
- exit 1 ; \
- fi ; \
- done ; \
- XDG_CONFIG_HOME= HOME= \
- git log -C --stat 1.15.0.. >$(distdir)/ChangeLog; \
+ for file in `git ls-files | grep -v .gitignore`; do \
+ if [ ! -e "$(distdir)/$$file" ]; then \
+ echo "$$file is missing in $(distdir)" >&2 ; \
+ exit 1 ; \
+ fi ; \
+ done ; \
+ XDG_CONFIG_HOME= HOME= \
+ git log -C --stat 1.15.0.. >$(distdir)/ChangeLog; \
fi
clean-local: doc-clean coverage-clean check-clean
diff --git a/dselect/Makefile.am b/dselect/Makefile.am
index 3d46643..885dbbc 100644
--- a/dselect/Makefile.am
+++ b/dselect/Makefile.am
@@ -56,11 +56,11 @@ CLEANFILES = curkeys.h
curkeys.$(OBJEXT): curkeys.h
curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
$(AM_V_GEN) cursesfile=`echo '#include "dselect-curses.h"' | \
- $(CPP) $(CPPFLAGS) -I$(top_builddir) -I $(srcdir) - | \
- grep '[^-]curses\.h' | head -n 1 | \
- sed -e 's/^[^"]*"//; s/".*$$//'`; \
+ $(CPP) $(CPPFLAGS) -I$(top_builddir) -I $(srcdir) - | \
+ grep '[^-]curses\.h' | head -n 1 | \
+ sed -e 's/^[^"]*"//; s/".*$$//'`; \
if [ "$$cursesfile" = "" ]; then \
- echo "can't find curses file"; exit 1; \
+ echo "can't find curses file"; exit 1; \
fi; \
$(PERL) $(srcdir)/mkcurkeys.pl $< $$cursesfile >$@
diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am
index 5d2ae26..5a0c97a 100644
--- a/dselect/methods/Makefile.am
+++ b/dselect/methods/Makefile.am
@@ -47,8 +47,8 @@ CLEANFILES = \
$(nobase_methods_SCRIPTS) \
$(nil)
-do_perl_subst = $(AM_V_GEN) \
- sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):"
+do_perl_subst = $(AM_V_GEN) sed \
+ -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):"
SUFFIXES = .pl
diff --git a/man/Makefile.am b/man/Makefile.am
index 14de9ca..3309a26 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -112,18 +112,16 @@ install-data-local: install-data-local- at USE_PO4A@
install-data-local-no:
install-data-local-yes:
for lang in $(LINGUAS); do \
- files=""; \
- for trans in $(dist_man_MANS); do \
- if [ -f $(builddir)/$$lang/$$trans ]; then \
- files="$$files $(builddir)/$$lang/$$trans"; \
- elif [ -f $(srcdir)/$$lang/$$trans ]; then \
- files="$$files $(srcdir)/$$lang/$$trans"; \
- fi; \
- done; \
- $(MAKE) install-man \
- mandir="$(mandir)/$$lang" \
- man_MANS="" \
- dist_man_MANS="$$files"; \
+ files=""; \
+ for trans in $(dist_man_MANS); do \
+ if [ -f $(builddir)/$$lang/$$trans ]; then \
+ files="$$files $(builddir)/$$lang/$$trans"; \
+ elif [ -f $(srcdir)/$$lang/$$trans ]; then \
+ files="$$files $(srcdir)/$$lang/$$trans"; \
+ fi; \
+ done; \
+ $(MAKE) install-man mandir="$(mandir)/$$lang" man_MANS="" \
+ dist_man_MANS="$$files"; \
done
uninstall-local: uninstall-local- at USE_PO4A@
@@ -131,25 +129,23 @@ uninstall-local: uninstall-local- at USE_PO4A@
uninstall-local-no:
uninstall-local-yes:
for lang in $(LINGUAS); do \
- files=""; \
- for trans in $(dist_man_MANS); do \
- if [ -f $(builddir)/$$lang/$$trans ]; then \
- files="$$files $(builddir)/$$lang/$$trans"; \
- elif [ -f $(srcdir)/$$lang/$$trans ]; then \
- files="$$files $(srcdir)/$$lang/$$trans"; \
- fi; \
- done; \
- $(MAKE) uninstall-man \
- mandir="$(mandir)/$$lang" \
- man_MANS="" \
- dist_man_MANS="$$files"; \
+ files=""; \
+ for trans in $(dist_man_MANS); do \
+ if [ -f $(builddir)/$$lang/$$trans ]; then \
+ files="$$files $(builddir)/$$lang/$$trans"; \
+ elif [ -f $(srcdir)/$$lang/$$trans ]; then \
+ files="$$files $(srcdir)/$$lang/$$trans"; \
+ fi; \
+ done; \
+ $(MAKE) uninstall-man mandir="$(mandir)/$$lang" man_MANS="" \
+ dist_man_MANS="$$files"; \
done
dist-hook: man.stamp
cp $(srcdir)/man.stamp $(distdir)/
for lang in $(LINGUAS_DIST); do \
- cp $(srcdir)/po/$$lang.po $(distdir)/po; \
- cp $(srcdir)/po/$$lang.add $(distdir)/po; \
- $(MKDIR_P) $(distdir)/$$lang; \
- cp -r $(srcdir)/$$lang $(distdir)/; \
+ cp $(srcdir)/po/$$lang.po $(distdir)/po; \
+ cp $(srcdir)/po/$$lang.add $(distdir)/po; \
+ $(MKDIR_P) $(distdir)/$$lang; \
+ cp -r $(srcdir)/$$lang $(distdir)/; \
done
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 7b1ac36..cf068d9 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -121,16 +121,16 @@ EXTRA_DIST += \
# Keep it even if empty to have man3dir correctly set
man3_MANS =
-do_perl_subst = $(AM_V_GEN) \
- sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \
- -e "s:\$$CONFDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$CONFDIR='$(pkgconfdir)':" \
- -e "s:\$$ADMINDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$ADMINDIR='$(admindir)':" \
- -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibdir)':" \
- -e "s:\$$DATADIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$DATADIR='$(pkgdatadir)':" \
- -e "s:\$$PROGVERSION[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$PROGVERSION='$(PACKAGE_VERSION)':"
+do_perl_subst = $(AM_V_GEN) sed \
+ -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \
+ -e "s:\$$CONFDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$CONFDIR='$(pkgconfdir)':" \
+ -e "s:\$$ADMINDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$ADMINDIR='$(admindir)':" \
+ -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibdir)':" \
+ -e "s:\$$DATADIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$DATADIR='$(pkgdatadir)':" \
+ -e "s:\$$PROGVERSION[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$PROGVERSION='$(PACKAGE_VERSION)':"
-do_shell_subst = $(AM_V_GEN) \
- sed -e "s:^version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:version=\"$(PACKAGE_VERSION)\":"
+do_shell_subst = $(AM_V_GEN) sed \
+ -e "s:^version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:version=\"$(PACKAGE_VERSION)\":"
SUFFIXES = .pl .sh
@@ -151,12 +151,12 @@ if BUILD_POD_DOC
# Remove empty manual pages (perl modules not documented)
$(MKDIR_P) $(DESTDIR)$(man3dir)
for module in $(nobase_dist_perllib_DATA); do \
- name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \
- $(POD2MAN) --utf8 --center=libdpkg-perl --release=$(VERSION) \
- --name="$$name" --section=3 $(srcdir)/$$module \
- >$(DESTDIR)$(man3dir)/$$name.3; \
- test -s $(DESTDIR)$(man3dir)/$$name.3 || \
- rm -f $(DESTDIR)$(man3dir)/$$name.3; \
+ name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \
+ $(POD2MAN) --utf8 --center=libdpkg-perl --release=$(VERSION) \
+ --name="$$name" --section=3 $(srcdir)/$$module \
+ >$(DESTDIR)$(man3dir)/$$name.3; \
+ test -s $(DESTDIR)$(man3dir)/$$name.3 || \
+ rm -f $(DESTDIR)$(man3dir)/$$name.3; \
done
endif
@@ -171,7 +171,7 @@ install-data-hook:
uninstall-local:
if BUILD_POD_DOC
for module in $(nobase_dist_perllib_DATA); do \
- rm -f $(DESTDIR)$(man3dir)/`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$/.3/'`; \
+ rm -f $(DESTDIR)$(man3dir)/`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$/.3/'`; \
done
endif
@@ -346,8 +346,7 @@ $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-i386.so: $(srcdir)/t/Dpkg_Shlibs/ba
$(srcdir)/t/Dpkg_Shlibs/libobjdump.patterns.so: $(srcdir)/t/Dpkg_Shlibs/patterns.cpp $(srcdir)/t/Dpkg_Shlibs/patterns.map
$(CXX) $(CXXFLAGS) -shared -fPIC -Wl,-soname -Wl,libpatterns.so.1 \
- -Wl,--version-script=$(srcdir)/t/Dpkg_Shlibs/patterns.map $< \
- -o $@
+ -Wl,--version-script=$(srcdir)/t/Dpkg_Shlibs/patterns.map $< -o $@
$(srcdir)/t/Dpkg_Shlibs/spacesyms.c: $(srcdir)/t/Dpkg_Shlibs/spacesyms-c-gen.pl
$(srcdir)/t/Dpkg_Shlibs/spacesyms-c-gen.pl > $@
@@ -359,8 +358,7 @@ $(srcdir)/t/Dpkg_Shlibs/spacesyms.o: $(srcdir)/t/Dpkg_Shlibs/spacesyms.c $(srcdi
$(srcdir)/t/Dpkg_Shlibs/libobjdump.spacesyms.so: $(srcdir)/t/Dpkg_Shlibs/spacesyms.o $(srcdir)/t/Dpkg_Shlibs/spacesyms.map
$(CC) -shared -Wl,-soname -Wl,libspacesyms.so.1 \
- -Wl,--version-script=$(srcdir)/t/Dpkg_Shlibs/spacesyms.map $< \
- -o $@
+ -Wl,--version-script=$(srcdir)/t/Dpkg_Shlibs/spacesyms.map $< -o $@
.PHONY: refresh-test-data
diff --git a/scripts/mk/Makefile.am b/scripts/mk/Makefile.am
index 0e1230e..4b92b78 100644
--- a/scripts/mk/Makefile.am
+++ b/scripts/mk/Makefile.am
@@ -7,12 +7,12 @@ dist_pkgdata_DATA = \
pkg-info.mk \
vendor.mk
-do_path_subst = $(AM_V_GEN) \
- sed -e "s:dpkg_datadir[[:space:]]*=[[:space:]]*[^[:space:]]*:dpkg_datadir = $(pkgdatadir):"
+do_path_subst = $(AM_V_GEN) sed \
+ -e "s:dpkg_datadir[[:space:]]*=[[:space:]]*[^[:space:]]*:dpkg_datadir = $(pkgdatadir):"
install-data-hook:
mv $(DESTDIR)$(pkgdatadir)/default.mk \
$(DESTDIR)$(pkgdatadir)/default.mk.tmp
$(do_path_subst) <$(DESTDIR)$(pkgdatadir)/default.mk.tmp \
- >$(DESTDIR)$(pkgdatadir)/default.mk
+ >$(DESTDIR)$(pkgdatadir)/default.mk
rm -f $(DESTDIR)$(pkgdatadir)/default.mk.tmp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list