Author: vedge
Date: 2008-10-29 04:25:58 -0300 (Wed, 29 Oct 2008)
New Revision: 763
Added:
trunk/install-manpages.sh
Modified:
trunk/Makefile
trunk/build.man.mk
trunk/mkconcurrent.pl
trunk/mkify.pl
trunk/mkprojfiles.pl
Log:
use an external script for manpages installation.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2008-10-28 11:57:33 UTC (rev 762)
+++ trunk/Makefile 2008-10-29 07:25:58 UTC (rev 763)
@@ -1,7 +1,7 @@
TOP=.
+include ${TOP}/Makefile.config
PROJECT= bsdbuild
-VERSION= 2.3
DIST= ${PROJECT}-${VERSION}
DISTFILE= ${DIST}.tar.gz
@@ -12,7 +12,7 @@
SHARE= hstrip.pl mkdep mkconcurrent.pl manlinks.pl cmpfiles.pl cleanfiles.pl \
gen-includes.pl gen-declspecs.pl get-version.pl get-release.pl \
- ml.xsl \
+ install-manpages.sh ml.xsl \
build.common.mk build.dep.mk build.lib.mk build.man.mk \
build.perl.mk build.prog.mk build.subdir.mk build.www.mk \
build.po.mk build.doc.mk build.den.mk build.proj.mk
@@ -131,6 +131,5 @@
.PHONY: install install-links install-links-subdir cleandir clean depend
release configure
-include ${TOP}/Makefile.config
include ${TOP}/mk/build.common.mk
include ${TOP}/mk/build.subdir.mk
Modified: trunk/build.man.mk
===================================================================
--- trunk/build.man.mk 2008-10-28 11:57:33 UTC (rev 762)
+++ trunk/build.man.mk 2008-10-29 07:25:58 UTC (rev 763)
@@ -348,183 +348,102 @@
install-man:
@if [ "${MAN1}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN1}" = "" ]; then \
- for F in ${MAN1}; do \
- CAT=`echo $$F | sed 's/.1$$/.cat1/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man1"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man1; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat1"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat1; \
- done; \
- else \
- for F in ${MAN1}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man1"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man1; \
- done; \
- for F in ${CATMAN1}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat1"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat1; \
- done; \
+ env MAN="${MAN1}" CATMAN="${CATMAN1}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man1" \
+ CATMANDIR="${MANDIR}/cat1" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN2}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN2}" = "" ]; then \
- for F in ${MAN2}; do \
- CAT=`echo $$F | sed 's/.2$$/.cat2/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man2"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man2; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat2"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat2; \
- done; \
- else \
- for F in ${MAN2}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man2"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man2; \
- done; \
- for F in ${CATMAN2}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat2"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat2; \
- done; \
+ env MAN="${MAN2}" CATMAN="${CATMAN2}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man2" \
+ CATMANDIR="${MANDIR}/cat2" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN3}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN3}" = "" ]; then \
- for F in ${MAN3}; do \
- CAT=`echo $$F | sed 's/.3$$/.cat3/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man3"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man3; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat3"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat3; \
- done; \
- else \
- for F in ${MAN3}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man3"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man3; \
- done; \
- for F in ${CATMAN3}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat3"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat3; \
- done; \
+ env MAN="${MAN3}" CATMAN="${CATMAN3}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man3" \
+ CATMANDIR="${MANDIR}/cat3" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN4}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN4}" = "" ]; then \
- for F in ${MAN4}; do \
- CAT=`echo $$F | sed 's/.4$$/.cat4/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man4"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man4; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat4"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat4; \
- done; \
- else \
- for F in ${MAN4}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man4"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man4; \
- done; \
- for F in ${CATMAN4}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat4"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat4; \
- done; \
+ env MAN="${MAN4}" CATMAN="${CATMAN4}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man4" \
+ CATMANDIR="${MANDIR}/cat4" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN5}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN5}" = "" ]; then \
- for F in ${MAN5}; do \
- CAT=`echo $$F | sed 's/.5$$/.cat5/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man5"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man5; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat5"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat5; \
- done; \
- else \
- for F in ${MAN5}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man5"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man5; \
- done; \
- for F in ${CATMAN5}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat5"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat5; \
- done; \
+ env MAN="${MAN5}" CATMAN="${CATMAN5}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man5" \
+ CATMANDIR="${MANDIR}/cat5" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN6}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN6}" = "" ]; then \
- for F in ${MAN6}; do \
- CAT=`echo $$F | sed 's/.6$$/.cat6/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man6"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man6; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat6"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat6; \
- done; \
- else \
- for F in ${MAN6}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man6"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man6; \
- done; \
- for F in ${CATMAN6}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat6"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat6; \
- done; \
+ env MAN="${MAN6}" CATMAN="${CATMAN6}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man6" \
+ CATMANDIR="${MANDIR}/cat6" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN7}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN7}" = "" ]; then \
- for F in ${MAN7}; do \
- CAT=`echo $$F | sed 's/.7$$/.cat7/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man7"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man7; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat7"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat7; \
- done; \
- else \
- for F in ${MAN7}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man7"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man7; \
- done; \
- for F in ${CATMAN7}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat7"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat7; \
- done; \
+ env MAN="${MAN7}" CATMAN="${CATMAN7}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man7" \
+ CATMANDIR="${MANDIR}/cat7" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN8}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN8}" = "" ]; then \
- for F in ${MAN8}; do \
- CAT=`echo $$F | sed 's/.8$$/.cat8/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man8"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man8; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat8"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat8; \
- done; \
- else \
- for F in ${MAN8}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man8"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man8; \
- done; \
- for F in ${CATMAN8}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat8"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat8; \
- done; \
+ env MAN="${MAN8}" CATMAN="${CATMAN8}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man8" \
+ CATMANDIR="${MANDIR}/cat8" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${MAN9}" != "" -a "${NOMAN}" != "yes" ]; then \
- if [ "${CATMAN9}" = "" ]; then \
- for F in ${MAN9}; do \
- CAT=`echo $$F | sed 's/.9$$/.cat9/'`; \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man9"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man9; \
- echo "${INSTALL_DATA} $$CAT ${MANDIR}/cat9"; \
- ${SUDO} ${INSTALL_DATA} $$CAT ${MANDIR}/cat9; \
- done; \
- else \
- for F in ${MAN9}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/man9"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/man9; \
- done; \
- for F in ${CATMAN9}; do \
- echo "${INSTALL_DATA} $$F ${MANDIR}/cat9"; \
- ${SUDO} ${INSTALL_DATA} $$F ${MANDIR}/cat9; \
- done; \
+ env MAN="${MAN9}" CATMAN="${CATMAN9}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ MANDIR="${MANDIR}/man9" \
+ CATMANDIR="${MANDIR}/cat9" \
+ ${SH} ${TOP}/mk/install-manpages.sh; \
+ if [ $$? != 0 ]; then \
+ echo "install-manpages.sh failed"; \
+ exit 1; \
fi; \
fi
@if [ "${NOMANLINKS}" != "yes" -a "${MANLINKS}" != "" ]; then \
Added: trunk/install-manpages.sh
===================================================================
--- trunk/install-manpages.sh (rev 0)
+++ trunk/install-manpages.sh 2008-10-29 07:25:58 UTC (rev 763)
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Public domain
+#
+# Install the manual pages ${MAN} and ${CATMAN} into ${MANDIR} and
+# ${CATMANDIR}, respectively. ${CATMAN} is optional.
+#
+
+for F in ${MAN}; do
+ echo "${INSTALL_DATA} $F ${MANDIR}"
+ ${INSTALL_DATA} $F ${MANDIR}
+ if [ $? != 0 ]; then
+ exit 1;
+ fi
+done
+
+for F in ${CATMAN} ignore; do
+ if [ "$F" = "ignore" ]; then continue; fi
+ CAT=`echo $F | sed 's/.1$$/.cat1/'`
+ echo "${INSTALL_DATA} $CAT ${CATMANDIR}"
+ ${INSTALL_DATA} $CAT ${CATMANDIR}
+ if [ $? != 0 ]; then
+ exit 1;
+ fi
+done
Modified: trunk/mkconcurrent.pl
===================================================================
--- trunk/mkconcurrent.pl 2008-10-28 11:57:33 UTC (rev 762)
+++ trunk/mkconcurrent.pl 2008-10-29 07:25:58 UTC (rev 763)
@@ -48,6 +48,7 @@
'^cleanfiles\.pl$',
'^gen-includes\.pl$',
'^gen-declspecs\.pl$',
+ '^install-manpages\.sh$',
);
sub Debug
Modified: trunk/mkify.pl
===================================================================
--- trunk/mkify.pl 2008-10-28 11:57:33 UTC (rev 762)
+++ trunk/mkify.pl 2008-10-29 07:25:58 UTC (rev 763)
@@ -31,7 +31,8 @@
cmpfiles.pl
cleanfiles.pl
gen-declspecs.pl
- gen-includes.pl);
+ gen-includes.pl
+ install-manpages.sh);
@LibtoolFiles = qw(
config.guess
Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl 2008-10-28 11:57:33 UTC (rev 762)
+++ trunk/mkprojfiles.pl 2008-10-29 07:25:58 UTC (rev 763)
@@ -301,7 +301,6 @@
}
if ($libName) {
if ($libShared) {
- DoPackage($libName.'_static', 'lib');
DoPackage($libName, 'dll');
} else {
DoPackage($libName, 'lib');
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
