[SCM] live-boot branch, debian-next, updated. debian/3.0_a26-1-20-g0622a98
Daniel Baumann
daniel at debian.org
Mon Apr 9 13:14:39 UTC 2012
The following commit has been merged in the debian-next branch:
commit 1e821c21107dc36f071659f8b2d7c8d95048b4d1
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Apr 9 15:12:18 2012 +0200
Updating toplevel Makefile to work with manpages having multiple dots in its filename.
diff --git a/Makefile b/Makefile
index 805636e..1ea0a36 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ install:
# Installing manpages
for MANPAGE in manpages/en/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
done
@@ -70,7 +70,7 @@ install:
do \
for MANPAGE in manpages/$${LANGUAGE}/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
done; \
done
@@ -102,7 +102,7 @@ uninstall:
# Uninstalling manpages
for MANPAGE in manpages/en/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE} .en.$${SECTION}).$${SECTION}; \
done
@@ -110,12 +110,12 @@ uninstall:
do \
for MANPAGE in manpages/$${LANGUAGE}/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
rm -f $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
done; \
done
- for SECTION in $(ls manpages/en/* | awk -F. '{ print $2 }'); \
+ for SECTION in $(for MANPAGE in $(ls manpages/en/*); do basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1; done | sort -u); \
do \
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} > /dev/null 2>&1 || true; \
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} > /dev/null 2>&1 || true; \
--
live-boot
More information about the debian-live-changes
mailing list