BSDBuild

Author: vedge Date: 2011-06-20 22:47:16 -0400 (Mon, 20 Jun 2011) New Revision: 915 Modified: trunk/build.lib.mk trunk/man/build.lib.mk.5 Log: - add ${LIBTOOLOPTS} setting (default to --tag=CC) - don't generate bundled libtool needlessly ... [More] (thanks reinoud!) Modified: trunk/build.lib.mk =================================================================== --- trunk/build.lib.mk2011-06-21 02:46:17 UTC (rev 914) +++ trunk/build.lib.mk2011-06-21 02:47:16 UTC (rev 915) < at >< at > -63,6 +63,7 < at >< at > LTMAIN_SH?=${TOP}/mk/libtool/ltmain.sh LTCONFIG_LOG?=./config.log LIBTOOLFLAGS?= +LIBTOOLOPTS?=--tag=CC SHARE?=none SHARESRC?=none < at >< at > -93,7 +94,8 < at >< at > .c.o: ${CC} ${CFLAGS} ${CPPFLAGS} -o $< at > -c $< .c.lo: ${LIBTOOL} -${LIBTOOL} --mode=compile ${CC} ${LIBTOOLFLAGS} ${CFLAGS} ${CPPFLAGS} -o $< at > -c $< +${LIBTOOL} ${LIBTOOLOPTS} --mode=compile \ + ${CC} ${LIBTOOLFLAGS} ${CFLAGS} ${CPPFLAGS} -o $< at > -c $< .c.po: ${CC} -pg -DPROF ${CFLAGS} ${CPPFLAGS} -o $< at > -c $< < at >< at > -101,7 +103,8 < at >< at > .m.o: ${CC} ${OBJCFLAGS} ${CPPFLAGS} -o $< at > -c $< .m.lo: ${LIBTOOL} -${LIBTOOL} --mode=compile ${CC} ${LIBTOOLFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -o $< at > -c $< +${LIBTOOL} ${LIBTOOLOPTS} --mode=compile \ + ${CC} ${LIBTOOLFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -o $< at > -c $< .m.po: ${CC} -pg -DPROF ${OBJCFLAGS} ${CPPFLAGS} -o $< at > -c $< < at >< at > -109,13 +112,15 < at >< at > .cc.o: ${CXX} ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< .cc.lo: ${LIBTOOL} -${LIBTOOL} --mode=compile ${CXX} ${LIBTOOLFLAGS} ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< +${LIBTOOL} ${LIBTOOLOPTS} --mode=compile \ + ${CXX} ${LIBTOOLFLAGS} ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< .cc.po: ${CXX} -pg -DPROF ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< .cpp.o: ${CXX} ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< .cpp.lo: ${LIBTOOL} -${LIBTOOL} --mode=compile ${CXX} ${LIBTOOLFLAGS} ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< +${LIBTOOL} ${LIBTOOLOPTS} --mode=compile \ + ${CXX} ${LIBTOOLFLAGS} ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< .cpp.po: ${CXX} -pg -DPROF ${CXXFLAGS} ${CPPFLAGS} -o $< at > -c $< < at >< at > -237,75 +242,72 < at >< at > done; \ if [ "${LIB_SHARED}" = "Yes" ]; then \ if [ "${LIB_MODULE}" = "Yes" ]; then \ - echo "${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la \ -module \ -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} $$_shobjs \ ${LIBS} ${LIB_XOBJS}"; \ - ${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -module \ + ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -module \ -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} $$_shobjs \ ${LIBS} ${LIB_XOBJS}; \ else \ - echo "${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la \ -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} $$_shobjs \ ${LIBS} ${LIB_XOBJS}"; \ - ${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ + ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la \ -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} $$_shobjs \ ${LIBS} ${LIB_XOBJS}; \ fi; \ else \ - echo "${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -static \ - ${LDFLAGS} $$_shobjs \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -static ${LDFLAGS} $$_shobjs \ ${LIBS} ${LIB_XOBJS}"; \ - ${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -static \ - ${LDFLAGS} $$_shobjs \ + ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -static ${LDFLAGS} $$_shobjs \ ${LIBS} ${LIB_XOBJS}; \ fi; \ else \ if [ "${LIB_SHARED}" = "Yes" ]; then \ if [ "${LIB_MODULE}" = "Yes" ]; then \ - echo "${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -module \ - -rpath ${PREFIX}/lib \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -module -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} ${SHOBJS} \ ${LIBS} ${LIB_XOBJS}"; \ - ${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -module \ - -rpath ${PREFIX}/lib \ + ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -module -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} ${SHOBJS} \ ${LIBS} ${LIB_XOBJS}; \ else \ - echo "${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -rpath ${PREFIX}/lib \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} ${SHOBJS} \ ${LIBS} ${LIB_XOBJS}"; \ - ${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -rpath ${PREFIX}/lib \ + ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -rpath ${PREFIX}/lib \ -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \ ${LDFLAGS} ${SHOBJS} \ ${LIBS} ${LIB_XOBJS}; \ fi; \ else \ - echo "${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -static \ - ${LDFLAGS} ${SHOBJS} \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -static ${LDFLAGS} ${SHOBJS} \ ${LIBS} ${LIB_XOBJS}"; \ - ${LIBTOOL} --mode=link ${CC} -o lib${LIB}.la \ - -static \ - ${LDFLAGS} ${SHOBJS} \ + ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \ + ${CC} -o lib${LIB}.la -static ${LDFLAGS} ${SHOBJS} \ ${LIBS} ${LIB_XOBJS}; \ fi; \ fi; \ < at >< at > -400,12 +402,12 < at >< at > ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}; \ fi; \ if [ "${USE_LIBTOOL}" = "Yes" ]; then \ - echo "${LIBTOOL} --mode=install \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=install \ ${INSTALL_LIB} lib${LIB}.la ${LIBDIR}"; \ - ${SUDO} ${LIBTOOL} --mode=install \ + ${SUDO} ${LIBTOOL} ${LIBTOOLOPTS} --mode=install \ ${INSTALL_LIB} lib${LIB}.la ${DESTDIR}${LIBDIR}; \ - echo "${LIBTOOL} --finish ${LIBDIR}"; \ - ${SUDO} ${LIBTOOL} --finish ${DESTDIR}${LIBDIR}; \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --finish ${LIBDIR}"; \ + ${SUDO} ${LIBTOOL} ${LIBTOOLOPTS} --finish ${DESTDIR}${LIBDIR}; \ else \ echo "${INSTALL_LIB} lib${LIB}.a ${LIBDIR}"; \ ${SUDO} ${INSTALL_LIB} lib${LIB}.a ${DESTDIR}${LIBDIR}; \ < at >< at > -468,9 +470,9 < at >< at > deinstall-lib: ${LIBTOOL_COOKIE} < at >if [ "${LIB}" != "" -a "${USE_LIBTOOL}" = "Yes" ]; then \ if [ "${USE_LIBTOOL}" = "Yes" ]; then \ - echo "${LIBTOOL} --mode=uninstall \ + echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=uninstall \ rm -f ${LIBDIR}/lib${LIB}.la"; \ - ${SUDO} ${LIBTOOL} --mode=uninstall \ + ${SUDO} ${LIBTOOL} ${LIBTOOLOPTS} --mode=uninstall \ rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la; \ else \ echo "${DEINSTALL_LIB} ${LIBDIR}/lib${LIB}.a"; \ < at >< at > -509,7 +511,8 < at >< at > (cd ${TOP} && ${MAKE} install-includes) ${LIBTOOL_COOKIE}: ${LTCONFIG} ${LTMAIN_SH} ${LTCONFIG_GUESS} ${LTCONFIG_SUB} -< at >if [ "${LIB}" != "" -a "${USE_LIBTOOL}" = "Yes" ]; then \ +< at >if [ "${LIB}" != "" -a "${USE_LIBTOOL}" = "Yes" \ + -a "${LIBTOOL_BUNDLED}" = "yes" ]; then \ echo "${SH} ${LTCONFIG} ${LTMAIN_SH} ${HOST}"; \ env CC="${CC}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ < at >< at > -522,8 +525,8 < at >< at > echo "mv libtool ${LIBTOOL}"; \ mv libtool ${LIBTOOL}; \ fi; \ - echo "${LIBTOOL}" > ${LIBTOOL_COOKIE}; \ fi +echo "${LIBTOOL}" > ${LIBTOOL_COOKIE} none: Modified: trunk/man/build.lib.mk.5 =================================================================== --- trunk/man/build.lib.mk.52011-06-21 02:46:17 UTC (rev 914) +++ trunk/man/build.lib.mk.52011-06-21 02:47:16 UTC (rev 915) < at >< at > -115,8 +115,14 < at >< at > .It Ev LIBTOOL Path to GNU .Xr libtool 1 . -Defaults to the bundled libtool, -.Pa ${TOP}/mk/libtool/libtool . +Usually set by configure script (defaults to system libtool, or the bundled +copy). +.It Ev LIBTOOLOPTS +Specify general libtool arguments (passed before --mode). +Defaults to "--tag=CC". +.It Ev LIBTOOLFLAGS +Specify extra compiler arguments when calling compiler from libtool +(passed after --mode). .It Ev LTCONFIG_LOG When using libtool, the output of the .Pa ltconfig [Less]

Author: vedge Date: 2011-06-20 22:48:01 -0400 (Mon, 20 Jun 2011) New Revision: 916 Modified: trunk/configure trunk/configure.in Log: 3.0-beta Modified: trunk/configure =================================================================== --- ... [More] trunk/configure2011-06-21 02:47:16 UTC (rev 915) +++ trunk/configure2011-06-21 02:48:01 UTC (rev 916) < at >< at > -671,7 +671,7 < at >< at > echo "#define PACKAGE \"$PACKAGE\"" >> config/package.h echo "#endif" >> config/package.h echo "hdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua -VERSION="2.9" +VERSION="3.0-beta" echo "VERSION=$VERSION" >>Makefile.config echo "mdefs[\"VERSION\"] = \"$VERSION\"" >>configure.lua echo "#ifndef VERSION" > config/version.h Modified: trunk/configure.in =================================================================== --- trunk/configure.in2011-06-21 02:47:16 UTC (rev 915) +++ trunk/configure.in2011-06-21 02:48:01 UTC (rev 916) < at >< at > -1,7 +1,7 < at >< at > # Public domain PACKAGE("BSDBuild") -VERSION("2.9") +VERSION("3.0-beta") RELEASE("Blast of Ancient Atmospheres") MDEFINE(SHAREDIR, "$PREFIX/share/bsdbuild") [Less]

Author: vedge Date: 2011-06-20 22:26:51 -0400 (Mon, 20 Jun 2011) New Revision: 912 Modified: trunk/Makefile trunk/configure trunk/configure.in Log: prevent "make install" from succeeding if ./configure was not ran. Modified: ... [More] trunk/Makefile =================================================================== --- trunk/Makefile2011-06-20 13:02:07 UTC (rev 911) +++ trunk/Makefile2011-06-21 02:26:51 UTC (rev 912) < at >< at > -26,36 +26,42 < at >< at > all: all-subdir ${SCRIPTS} -mkconfigure: mkconfigure.pl +config-ok: +< at >if [ "${CONFIGURE_OK}" != "yes" ]; then \ + echo "Please run ./configure first"; \ + exit 1; \ +fi + +mkconfigure: config-ok mkconfigure.pl sed -e s,%PREFIX%,${PREFIX}, \ -e s,%VERSION%,${VERSION}, \ mkconfigure.pl > mkconfigure -mkprojfiles: mkprojfiles.pl +mkprojfiles: config-ok mkprojfiles.pl sed -e s,%PREFIX%,${PREFIX}, \ -e s,%VERSION%,${VERSION}, \ mkprojfiles.pl > mkprojfiles -mkify: mkify.pl +mkify: config-ok mkify.pl sed -e s,%SHAREDIR%,${SHAREDIR}, \ -e s,%BINDIR%,${BINDIR}, \ mkify.pl > mkify -h2mandoc: h2mandoc.pl +h2mandoc: config-ok h2mandoc.pl sed -e s,%VERSION%,${VERSION}, \ h2mandoc.pl > h2mandoc -man2wiki: man2wiki.pl +man2wiki: config-ok man2wiki.pl sed -e s,%PREFIX%,${PREFIX}, \ -e s,%VERSION%,${VERSION}, \ man2wiki.pl > man2wiki -uman: uman.pl +uman: config-ok uman.pl sed -e s,%PREFIX%,${PREFIX}, \ -e s,%VERSION%,${VERSION}, \ uman.pl > uman -install: install-subdir +install: config-ok install-subdir < at >if [ ! -d "${DESTDIR}${SHAREDIR}" ]; then \ echo "${INSTALL_DATA_DIR} ${SHAREDIR}"; \ ${SUDO} ${INSTALL_DATA_DIR} "${DESTDIR}${SHAREDIR}"; \ < at >< at > -77,44 +83,6 < at >< at > ${SUDO} ${INSTALL_PROG} $$F "${DESTDIR}${BINDIR}"; \ done -install-links-subdir: -< at >(if [ "${SUBDIR}" = "" ]; then \ - SUBDIR="NONE"; \ -else \ - SUBDIR="${SUBDIR}"; \ -fi; \ -if [ "$$SUBDIR" != "" -a "$$SUBDIR" != "NONE" ]; then \ -for F in $$SUBDIR; do \ - echo "==> ${REL}$$F"; \ - (cd $$F && ${MAKE} REL=${REL}$$F/ install-links); \ - if [ $$? != 0 ]; then \ - exit 1; \ - fi; \ -done; \ -fi) - -install-links: install-links-subdir -< at >if [ ! -d "${DESTDIR}${SHAREDIR}" ]; then \ - echo "${INSTALL_DATA_DIR} ${SHAREDIR}"; \ - ${SUDO} ${INSTALL_DATA_DIR} "${DESTDIR}${SHAREDIR}"; \ -fi -< at >if [ ! -d "${SHAREDIR}/libtool" ]; then \ - echo "${INSTALL_DATA_DIR} ${SHAREDIR}/libtool"; \ - ${SUDO} ${INSTALL_DATA_DIR} "${DESTDIR}${SHAREDIR}/libtool"; \ -fi -< at >for F in ${SHARE}; do \ - echo "ln -sf `pwd`/$$F ${SHAREDIR}/$$F"; \ - ${SUDO} ln -sf `pwd`/$$F "${DESTDIR}${SHAREDIR}/$$F"; \ -done -< at >for F in ${LTFILES}; do \ - echo "${INSTALL_DATA} libtool/$$F ${SHAREDIR}/libtool"; \ - ${SUDO} ${INSTALL_DATA} libtool/$$F "${DESTDIR}${SHAREDIR}/libtool"; \ -done -< at >for F in ${SCRIPTS}; do \ - echo "${INSTALL_PROG} $$F.pl ${BINDIR}/$$F"; \ - ${SUDO} ${INSTALL_PROG} $$F.pl "${DESTDIR}${BINDIR}"; \ -done - cleandir: cleandir-subdir echo > Makefile.config rm -fR config.log config configure.lua < at >< at > -142,7 +110,7 < at >< at > rm -f ../$$F; \ done); -.PHONY: install install-links install-links-subdir cleandir clean depend release configure clean-release +.PHONY: install cleandir clean depend release configure clean-release config-ok include ${TOP}/mk/build.common.mk include ${TOP}/mk/build.subdir.mk Modified: trunk/configure =================================================================== --- trunk/configure2011-06-20 13:02:07 UTC (rev 911) +++ trunk/configure2011-06-21 02:26:51 UTC (rev 912) < at >< at > -1,7 +1,7 < at >< at > #!/bin/sh # # Do not edit! -# This file was generated from configure.in by BSDBuild 2.8. +# This file was generated from configure.in by BSDBuild 2.9. # # To regenerate this file, get the latest BSDBuild release from # http://hypertriton.com/bsdbuild/, and use the command: < at >< at > -347,7 +347,7 < at >< at > fi fi if [ "${show_help}" = "yes" ]; then -echo "This configure script was generated by BSDBuild 2.8." +echo "This configure script was generated by BSDBuild 2.9." echo "<http://bsdbuild.hypertriton.com/>" echo "" echo "Usage: ./configure [options]" < at >< at > -382,7 +382,7 < at >< at > exit 1 fi; if [ "${show_version}" = "yes" ]; then -echo "BSDBuild 2.8" +echo "BSDBuild 2.9" exit 0 fi; if [ "${srcdir}" != "" ]; then < at >< at > -409,12 +409,12 < at >< at > else CROSS_COMPILING="no" fi -echo "BSDBuild 2.8 (host: $host)" +echo "BSDBuild 2.9 (host: $host)" if [ -e "Makefile.config" ]; then echo "* Overwriting existing Makefile.config" fi -echo "# Generated by configure script (BSDBuild 2.8)." > Makefile.config +echo "# Generated by configure script (BSDBuild 2.9)." > Makefile.config echo "" >> Makefile.config echo "BUILD=${build}" >> Makefile.config echo "HOST=${host}" >> Makefile.config < at >< at > -423,7 +423,7 < at >< at > echo "BLDDIR=${BLD}" >> Makefile.config echo "Generated by configure script" > config.log -echo "BSDBuild Version: 2.8" >> config.log +echo "BSDBuild Version: 2.9" >> config.log echo "Host: $host" >> config.log for arg < at >< at > -688,8 +688,10 < at >< at > SHAREDIR="$PREFIX/share/bsdbuild" echo "SHAREDIR=$SHAREDIR" >>Makefile.config echo "mdefs[\"SHAREDIR\"] = \"$SHAREDIR\"" >>configure.lua +CONFIGURE_OK="yes" +echo "CONFIGURE_OK=$CONFIGURE_OK" >>Makefile.config +echo "mdefs[\"CONFIGURE_OK\"] = \"$CONFIGURE_OK\"" >>configure.lua echo "*" echo "* Configuration successful." -echo "* Use \"make all install\" to compile and install BSDBuild." -echo "* Use \"make install-links\" to install links to source (for developers)." +echo "* Use \"make all install\" to build and install BSDBuild." echo "*" Modified: trunk/configure.in =================================================================== --- trunk/configure.in2011-06-20 13:02:07 UTC (rev 911) +++ trunk/configure.in2011-06-21 02:26:51 UTC (rev 912) < at >< at > -5,10 +5,10 < at >< at > RELEASE("Blast of Ancient Atmospheres") MDEFINE(SHAREDIR, "$PREFIX/share/bsdbuild") +MDEFINE(CONFIGURE_OK, "yes") echo "*" echo "* Configuration successful." -echo "* Use \"make all install\" to compile and install BSDBuild." -echo "* Use \"make install-links\" to install links to source (for developers)." +echo "* Use \"make all install\" to build and install BSDBuild." echo "*" [Less]

Author: vedge Date: 2011-06-20 09:02:07 -0400 (Mon, 20 Jun 2011) New Revision: 911 Added: trunk/ChangeLogs/Release-2.9.txt Log: 2.9 Added: trunk/ChangeLogs/Release-2.9.txt =================================================================== --- ... [More] trunk/ChangeLogs/Release-2.9.txt (rev 0) +++ trunk/ChangeLogs/Release-2.9.txt2011-06-20 13:02:07 UTC (rev 911) < at >< at > -0,0 +1,16 < at >< at > + +Release Notes for BSDBuild 2.9 +------------------------------ +- Default to using the system libtool where available. +- Added tests: clock_win32, agar_au, xinerama. +- Added test: sdl_ttf (thanks markand!) +- Honor ${DESTDIR} everywhere (thanks reinoud!) +- Introduce TEST_DIR() configure.in directive, for specifying location to + third-party test module directory. +- Fix default "make -j" behavior (thanks reinoud!) +- Tweaked test code to work around GCC 4.6 "-Wall" warnings. +- Various fixes for tests under NetBSD (thanks reinoud!) +- In various tests, try pkg-config first before scanning for paths. +- Added ${LIB_MODULE} setting to build.lib.mk (set to Yes to build a + dlopen()able module). + [Less]

Author: vedge Date: 2011-06-20 08:46:40 -0400 (Mon, 20 Jun 2011) New Revision: 910 Modified: trunk/configure trunk/configure.in Log: 2.9 Modified: trunk/configure =================================================================== --- ... [More] trunk/configure2011-06-20 12:45:46 UTC (rev 909) +++ trunk/configure2011-06-20 12:46:40 UTC (rev 910) < at >< at > -671,7 +671,7 < at >< at > echo "#define PACKAGE \"$PACKAGE\"" >> config/package.h echo "#endif" >> config/package.h echo "hdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua -VERSION="2.8" +VERSION="2.9" echo "VERSION=$VERSION" >>Makefile.config echo "mdefs[\"VERSION\"] = \"$VERSION\"" >>configure.lua echo "#ifndef VERSION" > config/version.h Modified: trunk/configure.in =================================================================== --- trunk/configure.in2011-06-20 12:45:46 UTC (rev 909) +++ trunk/configure.in2011-06-20 12:46:40 UTC (rev 910) < at >< at > -1,7 +1,7 < at >< at > # Public domain PACKAGE("BSDBuild") -VERSION("2.8") +VERSION("2.9") RELEASE("Blast of Ancient Atmospheres") MDEFINE(SHAREDIR, "$PREFIX/share/bsdbuild") [Less]

Author: vedge Date: 2011-06-20 08:45:46 -0400 (Mon, 20 Jun 2011) New Revision: 909 Modified: trunk/install-manpages.sh trunk/mk/install-manpages.sh Log: skip unexisting manpages without failing Modified: trunk/install-manpages.sh ... [More] =================================================================== --- trunk/install-manpages.sh2011-05-27 15:00:41 UTC (rev 908) +++ trunk/install-manpages.sh2011-06-20 12:45:46 UTC (rev 909) < at >< at > -6,22 +6,31 < at >< at > # ${CATMANDIR}, respectively. ${CATMAN} is optional. # -for F in ${MAN}; do -echo "${INSTALL_DATA} $F ${MANDIR}" -${INSTALL_DATA} $F ${MANDIR} -if [ $? != 0 ]; then -exit 1; +for F in ${MAN} ignore; do +if [ "$F" = "ignore" ]; then continue; fi +if [ -e "$F" ]; then +echo "${INSTALL_DATA} $F ${MANDIR}" +${INSTALL_DATA} $F ${MANDIR} +if [ $? != 0 ]; then +exit 1; +fi +else +echo "* Skipping: $F" fi done if [ "${NOCATMAN}" != "yes" ]; then 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; +if [ -e "$F" ]; then +CAT=`echo $F | sed 's/.1$$/.cat1/'` +echo "${INSTALL_DATA} $CAT ${CATMANDIR}" +${INSTALL_DATA} $CAT ${CATMANDIR} +if [ $? != 0 ]; then +exit 1; +fi +else +echo "* Skipping: $F" fi done fi Modified: trunk/mk/install-manpages.sh =================================================================== --- trunk/mk/install-manpages.sh2011-05-27 15:00:41 UTC (rev 908) +++ trunk/mk/install-manpages.sh2011-06-20 12:45:46 UTC (rev 909) < at >< at > -6,11 +6,14 < at >< at > # ${CATMANDIR}, respectively. ${CATMAN} is optional. # -for F in ${MAN}; do -echo "${INSTALL_DATA} $F ${MANDIR}" -${INSTALL_DATA} $F ${MANDIR} -if [ $? != 0 ]; then -exit 1; +for F in ${MAN} ignore; do +if [ "$F" = "ignore" ]; then continue; fi +if [ -e "$F" ]; then +echo "${INSTALL_DATA} $F ${MANDIR}" +${INSTALL_DATA} $F ${MANDIR} +if [ $? != 0 ]; then +exit 1; +fi fi done [Less]

Author: vedge Date: 2011-05-27 10:18:20 -0400 (Fri, 27 May 2011) New Revision: 906 Modified: trunk/build.lib.mk trunk/build.man.mk trunk/build.prog.mk Log: avoid unnecessary make sub-invocations; fix parallel building Modified: ... [More] trunk/build.lib.mk =================================================================== --- trunk/build.lib.mk2011-05-19 10:31:55 UTC (rev 905) +++ trunk/build.lib.mk2011-05-27 14:18:20 UTC (rev 906) < at >< at > -159,17 +159,19 < at >< at > _lib_objs: < at >if [ "${LIB}" != "" -a "${OBJS}" = "none" -a "${SRCS}" != "none" \ -a "${USE_LIBTOOL}" = "No" ]; then \ + FLIST=""; \ for F in ${SRCS}; do \ F=`echo $$F | sed 's/.[clym]$$/.o/'`; \ F=`echo $$F | sed 's/.cc$$/.o/'`; \ F=`echo $$F | sed 's/.cpp$$/.o/'`; \ F=`echo $$F | sed 's/.asm$$/.o/'`; \ - ${MAKE} $$F; \ -if [ $$? != 0 ]; then \ -echo "${MAKE}: failure"; \ -exit 1; \ -fi; \ +FLIST="$$FLIST $$F"; \ done; \ + ${MAKE} $$FLIST; \ + if [ $$? != 0 ]; then \ + echo "${MAKE}: failure"; \ + exit 1; \ + fi; \ fi < at >if [ "${WINRES}" != "" -a "${WINDRES}" != "" ]; then \ echo "${WINDRES} -o ${WINRES}.o ${WINRES}"; \ < at >< at > -180,17 +182,19 < at >< at > _lib_shobjs: < at >if [ "${LIB}" != "" -a "${SHOBJS}" = "none" -a "${SRCS}" != "none" \ -a "${USE_LIBTOOL}" = "Yes" ]; then \ + FLIST=""; \ for F in ${SRCS}; do \ F=`echo $$F | sed 's/.[clym]$$/.lo/'`; \ F=`echo $$F | sed 's/.cc$$/.lo/'`; \ F=`echo $$F | sed 's/.cpp$$/.lo/'`; \ F=`echo $$F | sed 's/.asm$$/.lo/'`; \ - ${MAKE} $$F; \ -if [ $$? != 0 ]; then \ -echo "${MAKE}: failure"; \ -exit 1; \ -fi; \ - done; \ +FLIST="$$FLIST $$F"; \ + done; \ + ${MAKE} $$FLIST; \ + if [ $$? != 0 ]; then \ + echo "${MAKE}: failure"; \ + exit 1; \ + fi; \ fi # Build a non-libtool version of the library. Modified: trunk/build.man.mk =================================================================== --- trunk/build.man.mk2011-05-19 10:31:55 UTC (rev 905) +++ trunk/build.man.mk2011-05-27 14:18:20 UTC (rev 906) < at >< at > -1,5 +1,5 < at >< at > # -# Copyright (c) 2001-2010 Hypertriton, Inc. <http://hypertriton.com/> +# Copyright (c) 2001-2011 Hypertriton, Inc. <http://hypertriton.com/> # All rights reserved. # # Redistribution and use in source and binary forms, with or without < at >< at > -82,90 +82,108 < at >< at > preformat-man: < at >if [ "${MAN1}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN1}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN1}; do \ CAT=`echo $$F | sed 's/.1$$/.cat1/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN1}; \ fi; \ fi < at >if [ "${MAN2}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN2}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN2}; do \ CAT=`echo $$F | sed 's/.2$$/.cat2/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN2}; \ fi; \ fi < at >if [ "${MAN3}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN3}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN3}; do \ CAT=`echo $$F | sed 's/.3$$/.cat3/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN3}; \ fi; \ fi < at >if [ "${MAN4}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN4}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN4}; do \ CAT=`echo $$F | sed 's/.4$$/.cat4/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN4}; \ fi; \ fi < at >if [ "${MAN5}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN5}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN5}; do \ CAT=`echo $$F | sed 's/.5$$/.cat5/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN5}; \ fi; \ fi < at >if [ "${MAN6}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN6}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN6}; do \ CAT=`echo $$F | sed 's/.6$$/.cat6/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN6}; \ fi; \ fi < at >if [ "${MAN7}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN7}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN7}; do \ CAT=`echo $$F | sed 's/.7$$/.cat7/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN7}; \ fi; \ fi < at >if [ "${MAN8}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN8}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN8}; do \ CAT=`echo $$F | sed 's/.8$$/.cat8/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN8}; \ fi; \ fi < at >if [ "${MAN9}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN9}" = "" ]; then \ + CATLIST=""; \ for F in ${MAN9}; do \ CAT=`echo $$F | sed 's/.9$$/.cat9/'`; \ - ${MAKE} $$CAT; \ + CATLIST="$$CATLIST $$CAT"; \ done; \ + ${MAKE} $$CATLIST; \ else \ ${MAKE} ${CATMAN9}; \ fi; \ Modified: trunk/build.prog.mk =================================================================== --- trunk/build.prog.mk2011-05-19 10:31:55 UTC (rev 905) +++ trunk/build.prog.mk2011-05-27 14:18:20 UTC (rev 906) < at >< at > -135,17 +135,19 < at >< at > _prog_objs: < at >if [ "${PROG}" != "" -a "${OBJS}" = "none" \ -a "${SRCS}" != "none" ]; then \ + FLIST=""; \ for F in ${SRCS}; do \ F=`echo $$F | sed 's/.[clym]$$/.o/'`; \ F=`echo $$F | sed 's/.cc$$/.o/'`; \ F=`echo $$F | sed 's/.cpp$$/.o/'`; \ F=`echo $$F | sed 's/.asm$$/.o/'`; \ - ${MAKE} $$F; \ -if [ $$? != 0 ]; then \ -echo "${MAKE}: failure"; \ -exit 1; \ -fi; \ +FLIST="$$FLIST $$F"; \ done; \ + ${MAKE} $$FLIST; \ + if [ $$? != 0 ]; then \ + echo "${MAKE}: failure"; \ +exit 1; \ + fi; \ fi < at >if [ "${WINRES}" != "" -a "${WINDRES}" != "" ]; then \ echo "${WINDRES} -o ${WINRES}.o ${WINRES}"; \ < at >< at > -156,17 +158,19 < at >< at > _prog_pobjs: < at >if [ "${GMONOUT}" != "" -a "${POBJS}" = "none" \ -a "${SRCS}" != "none" ]; then \ + FLIST=""; \ for F in ${SRCS}; do \ F=`echo $$F | sed 's/.[clym]$$/.po/'`; \ F=`echo $$F | sed 's/.cc$$/.po/'`; \ F=`echo $$F | sed 's/.cpp$$/.po/'`; \ F=`echo $$F | sed 's/.asm$$/.po/'`; \ - ${MAKE} $$F; \ -if [ $$? != 0 ]; then \ -echo "${MAKE}: failure"; \ -exit 1; \ -fi; \ +FLIST="$$FLIST $$F"; \ done; \ + ${MAKE} $$FLIST; \ + if [ $$? != 0 ]; then \ + echo "${MAKE}: failure"; \ + exit 1; \ + fi; \ fi # Compile and link the program [Less]

Author: vedge Date: 2011-05-27 10:56:51 -0400 (Fri, 27 May 2011) New Revision: 907 Modified: trunk/BSDBuild/Makefile trunk/Makefile trunk/build.man.mk trunk/build.po.mk trunk/build.www.mk trunk/configure Log: ${DESTDIR} fixes; ... [More] thanks reinoud-qavaossjCcEdnm+yROfE0A< at >public.gmane.org! Modified: trunk/BSDBuild/Makefile =================================================================== --- trunk/BSDBuild/Makefile2011-05-27 14:18:20 UTC (rev 906) +++ trunk/BSDBuild/Makefile2011-05-27 14:56:51 UTC (rev 907) < at >< at > -104,23 +104,23 < at >< at > all: install: -< at >if [ ! -d "${SHAREDIR}/BSDBuild" ]; then \ +< at >if [ ! -d "${DESTDIR}${SHAREDIR}/BSDBuild" ]; then \ echo "${INSTALL_DATA_DIR} ${SHAREDIR}/BSDBuild"; \ - ${SUDO} ${INSTALL_DATA_DIR} ${SHAREDIR}/BSDBuild; \ + ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}/BSDBuild; \ fi; \ for F in ${SHARE}; do \ echo "${INSTALL_DATA} $$F ${SHAREDIR}/BSDBuild"; \ - ${SUDO} ${INSTALL_DATA} $$F ${SHAREDIR}/BSDBuild; \ + ${SUDO} ${INSTALL_DATA} $$F ${DESTDIR}${SHAREDIR}/BSDBuild; \ done install-links: -< at >if [ ! -d "${SHAREDIR}/BSDBuild" ]; then \ +< at >if [ ! -d "${DESTDIR}${SHAREDIR}/BSDBuild" ]; then \ echo "${INSTALL_DATA_DIR} ${SHAREDIR}/BSDBuild"; \ - ${SUDO} ${INSTALL_DATA_DIR} ${SHAREDIR}/BSDBuild; \ + ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}/BSDBuild; \ fi; \ for F in ${SHARE}; do \ echo "ln -sf `pwd`/$$F ${SHAREDIR}/BSDBuild/$$F"; \ - ${SUDO} ln -sf `pwd`/$$F ${SHAREDIR}/BSDBuild/$$F; \ + ${SUDO} ln -sf `pwd`/$$F ${DESTDIR}${SHAREDIR}/BSDBuild/$$F; \ done clean: Modified: trunk/Makefile =================================================================== --- trunk/Makefile2011-05-27 14:18:20 UTC (rev 906) +++ trunk/Makefile2011-05-27 14:56:51 UTC (rev 907) < at >< at > -56,11 +56,11 < at >< at > uman.pl > uman install: install-subdir -< at >if [ ! -d "${SHAREDIR}" ]; then \ +< at >if [ ! -d "${DESTDIR}${SHAREDIR}" ]; then \ echo "${INSTALL_DATA_DIR} ${SHAREDIR}"; \ ${SUDO} ${INSTALL_DATA_DIR} "${DESTDIR}${SHAREDIR}"; \ fi -< at >if [ ! -d "${SHAREDIR}/libtool" ]; then \ +< at >if [ ! -d "${DESTDIR}${SHAREDIR}/libtool" ]; then \ echo "${INSTALL_DATA_DIR} ${SHAREDIR}/libtool"; \ ${SUDO} ${INSTALL_DATA_DIR} "${DESTDIR}${SHAREDIR}/libtool"; \ fi < at >< at > -94,7 +94,7 < at >< at > fi) install-links: install-links-subdir -< at >if [ ! -d "${SHAREDIR}" ]; then \ +< at >if [ ! -d "${DESTDIR}${SHAREDIR}" ]; then \ echo "${INSTALL_DATA_DIR} ${SHAREDIR}"; \ ${SUDO} ${INSTALL_DATA_DIR} "${DESTDIR}${SHAREDIR}"; \ fi Modified: trunk/build.man.mk =================================================================== --- trunk/build.man.mk2011-05-27 14:18:20 UTC (rev 906) +++ trunk/build.man.mk2011-05-27 14:56:51 UTC (rev 907) < at >< at > -287,79 +287,79 < at >< at > install-man-dirs: < at >if [ "${MANS}" != " " ]; then \ - if [ ! -d "${MANDIR}" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}; \ fi; \ - if [ ! -d "${MANDIR}/man1" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man1" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man1"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man1; \ fi; \ - if [ ! -d "${MANDIR}/man2" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man2" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man2"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man2; \ fi; \ - if [ ! -d "${MANDIR}/man3" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man3" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man3"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man3; \ fi; \ - if [ ! -d "${MANDIR}/man4" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man4" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man4"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man4; \ fi; \ - if [ ! -d "${MANDIR}/man5" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man5" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man5"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man5; \ fi; \ - if [ ! -d "${MANDIR}/man6" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man6" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man6"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man6; \ fi; \ - if [ ! -d "${MANDIR}/man7" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man7" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man7"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man7; \ fi; \ - if [ ! -d "${MANDIR}/man8" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man8" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man8"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man8; \ fi; \ - if [ ! -d "${MANDIR}/man9" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/man9" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/man9"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man9; \ fi; \ - if [ ! -d "${MANDIR}/cat1" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat1" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat1"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat1; \ fi; \ - if [ ! -d "${MANDIR}/cat2" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat2" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat2"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat2; \ fi; \ - if [ ! -d "${MANDIR}/cat3" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat3" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat3"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat3; \ fi; \ - if [ ! -d "${MANDIR}/cat4" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat4" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat4"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat4; \ fi; \ - if [ ! -d "${MANDIR}/cat5" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat5" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat5"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat5; \ fi; \ - if [ ! -d "${MANDIR}/cat6" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat6" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat6"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat6; \ fi; \ - if [ ! -d "${MANDIR}/cat7" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat7" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat7"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat7; \ fi; \ - if [ ! -d "${MANDIR}/cat8" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat8" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat8"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat8; \ fi; \ - if [ ! -d "${MANDIR}/cat9" ]; then \ + if [ ! -d "${DESTDIR}${MANDIR}/cat9" ]; then \ echo "${INSTALL_MAN_DIR} ${MANDIR}/cat9"; \ ${SUDO} ${INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/cat9; \ fi; \ Modified: trunk/build.po.mk =================================================================== --- trunk/build.po.mk2011-05-27 14:18:20 UTC (rev 906) +++ trunk/build.po.mk2011-05-27 14:56:51 UTC (rev 907) < at >< at > -104,7 +104,7 < at >< at > < at >export _mos="${MOS}"; \ if [ "${ENABLE_NLS}" = "yes" -a "${HAVE_GETTEXT}" = "yes" \ -a "$$_mos" != "" ]; then \ - if [ ! -d "${LOCALEDIR}" ]; then \ + if [ ! -d "${DESTDIR}${LOCALEDIR}" ]; then \ echo "${INSTALL_DATA_DIR} ${LOCALEDIR}"; \ ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${LOCALEDIR}; \ fi; \ Modified: trunk/build.www.mk =================================================================== --- trunk/build.www.mk2011-05-27 14:18:20 UTC (rev 906) +++ trunk/build.www.mk2011-05-27 14:56:51 UTC (rev 907) < at >< at > -138,12 +138,12 < at >< at > < at >if [ "${HTMLDIR}" = "none" ]; then \ exit 0; \ fi -< at >if [ ! -d "${HTMLDIR}" ]; then \ +< at >if [ ! -d "${DESTDIR}${HTMLDIR}" ]; then \ echo "${INSTALL_DATA_DIR} ${HTMLDIR}"; \ ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}; \ fi < at >if [ "${HTML_INSTSOURCE}" = "Yes" ]; then \ -if [ ! -d "${HTMLDIR}/mk" ]; then \ +if [ ! -d "${DESTDIR}${HTMLDIR}/mk" ]; then \ echo "${INSTALL_DATA_DIR} ${HTMLDIR}/mk"; \ ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/mk; \ fi; \ < at >< at > -152,12 +152,12 < at >< at > ${SUDO} ${INSTALL_DATA} ${TOP}/mk/$$MK \ ${DESTDIR}${HTMLDIR}/mk; \ done; \ - if [ ! -d "${HTMLDIR}/xsl" ]; then \ + if [ ! -d "${DESTDIR}${HTMLDIR}/xsl" ]; then \ echo "${INSTALL_DATA_DIR} ${HTMLDIR}/xsl"; \ ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/xsl; \ fi; \ for XSL in ${XSL}; do \ -if [ -e "${HTMLDIR}/xsl/$$XSL" \ +if [ -e "${DESTDIR}${HTMLDIR}/xsl/$$XSL" \ -a "${HTML_OVERWRITE}" = "" ]; then \ echo "xsl/$$XSL: exists; preserving"; \ else \ < at >< at > -166,12 +166,12 < at >< at > ${DESTDIR}${HTMLDIR}/xsl; \ fi; \ done; \ -if [ ! -d "${HTMLDIR}/m4" ]; then \ +if [ ! -d "${DESTDIR}${HTMLDIR}/m4" ]; then \ echo "${INSTALL_DATA_DIR} ${HTMLDIR}/m4"; \ ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/m4; \ fi; \ (cd ${BASEDIR}; for M4IN in `ls -1 *.m4`; do \ -if [ -e "${HTMLDIR}/m4/$$M4IN" \ +if [ -e "${DESTDIR}${HTMLDIR}/m4/$$M4IN" \ -a "${HTML_OVERWRITE}" = "" ]; then \ echo "m4/$$M4IN: exists; preserving"; \ else \ < at >< at > -184,7 +184,7 < at >< at > < at >for F in ${HTML}; do \ rm -f $$F; \ if [ "${HTML_INSTSOURCE}" = "Yes" -a \ - ! -e "${HTMLDIR}/Makefile" ]; then \ + ! -e "${DESTDIR}${HTMLDIR}/Makefile" ]; then \ echo "TOP=." > Makefile.prep; \ echo "HTML=${HTML}" >> Makefile.prep; \ echo "HTMLDIR=none" >> Makefile.prep; \ < at >< at > -204,7 +204,7 < at >< at > fi; \ if [ "${HTML_INSTSOURCE}" = "Yes" ]; then \ export SF=`echo $$F |sed s,.html$$,.htm,`; \ -if [ -e "${HTMLDIR}/$$SF" \ +if [ -e "${DESTDIR}${HTMLDIR}/$$SF" \ -a "${HTML_OVERWRITE}" = "" ]; then \ echo "$$SF exists; preserving"; \ else \ < at >< at > -213,7 +213,7 < at >< at > ${DESTDIR}${HTMLDIR}; \ fi; \ fi; \ -if [ -e "${HTMLDIR}/$$F.var" \ +if [ -e "${DESTDIR}${HTMLDIR}/$$F.var" \ -a "${HTML_OVERWRITE}" = "" ]; then \ echo "$$F.var exists; preserving"; \ else \ < at >< at > -222,7 +222,7 < at >< at > fi; \ for LANG in ${LANGUAGES}; do \ for ENC in `ls -1 $$F.$$LANG*`; do \ - if [ -e "${HTMLDIR}/$$ENC" \ + if [ -e "${DESTDIR}${HTMLDIR}/$$ENC" \ -a "${HTML_OVERWRITE}" = "" ]; then \ echo "$$ENC exists; preserving"; \ else \ Modified: trunk/configure =================================================================== --- trunk/configure2011-05-27 14:18:20 UTC (rev 906) +++ trunk/configure2011-05-27 14:56:51 UTC (rev 907) < at >< at > -8,7 +8,7 < at >< at > # # $ cat configure.in | mkconfigure > configure # -# Copyright (c) 2001-2010 Hypertriton, Inc. <http://hypertriton.com/> +# Copyright (c) 2001-2011 Hypertriton, Inc. <http://hypertriton.com/> # All rights reserved. # # Redistribution and use in source and binary forms, with or without < at >< at > -174,6 +174,15 < at >< at > fi fi done +PKGCONFIG="" +for path in `echo $PATH | sed 's/:/ /g'`; do +if [ -x "${path}" ]; then +if [ -e "${path}/pkg-config" ]; then +PKGCONFIG="${path}/pkg-config" +break +fi +fi +done if [ "${prefix}" != "" ]; then PREFIX="$prefix" else < at >< at > -531,8 +540,25 < at >< at > fi fi echo "CTAGS=${CTAGS}" >> Makefile.config -LIBTOOL_BUNDLED="yes" -LIBTOOL=\${TOP}/mk/libtool/libtool +if [ "${prefix_libtool}" != "" ]; then +LIBTOOL_BUNDLED="no" +LIBTOOL="${prefix_libtool}" +else +LIBTOOL="" +for path in `echo $PATH | sed 's/:/ /g'`; do +if [ -x "${path}/libtool" ]; then +LIBTOOL="${path}/libtool" +break +fi +done +if [ "${LIBTOOL}" = "" ]; then +LIBTOOL_BUNDLED="yes" +LIBTOOL=\${TOP}/mk/libtool/libtool +else +LIBTOOL_BUNDLED="no" +fi +fi +echo "LIBTOOL_BUNDLED=${LIBTOOL_BUNDLED}" >> Makefile.config echo "LIBTOOL=${LIBTOOL}" >> Makefile.config echo "PREFIX?=${PREFIX}" >> Makefile.config echo "#ifndef PREFIX" > config/prefix.h [Less]

Author: vedge Date: 2011-05-27 11:00:41 -0400 (Fri, 27 May 2011) New Revision: 908 Modified: trunk/BSDBuild/gettext.pm trunk/BSDBuild/iconv.pm trunk/BSDBuild/jpeg.pm trunk/BSDBuild/opengl.pm trunk/BSDBuild/x11.pm Log: add /usr/X11R6 ... [More] , /usr/pkg to hardcoded paths; thanks reinoud-qavaossjCcEdnm+yROfE0A< at >public.gmane.org! Modified: trunk/BSDBuild/gettext.pm =================================================================== --- trunk/BSDBuild/gettext.pm2011-05-27 14:56:51 UTC (rev 907) +++ trunk/BSDBuild/gettext.pm2011-05-27 15:00:41 UTC (rev 908) < at >< at > -28,6 +28,7 < at >< at > '/usr/local', '/opt', '/opt/local', +'/usr/pkg' ); my $testCode = << "EOF"; #include <libintl.h> Modified: trunk/BSDBuild/iconv.pm =================================================================== --- trunk/BSDBuild/iconv.pm2011-05-27 14:56:51 UTC (rev 907) +++ trunk/BSDBuild/iconv.pm2011-05-27 15:00:41 UTC (rev 908) < at >< at > -28,6 +28,7 < at >< at > '/usr/local', '/opt', '/opt/local', +'/usr/pkg' ); my $testCode = << "EOF"; Modified: trunk/BSDBuild/jpeg.pm =================================================================== --- trunk/BSDBuild/jpeg.pm2011-05-27 14:56:51 UTC (rev 907) +++ trunk/BSDBuild/jpeg.pm2011-05-27 15:00:41 UTC (rev 908) < at >< at > -27,6 +27,7 < at >< at > '/usr/local', '/usr/X11R6', '/usr', +'/usr/pkg', '/opt/local', '/opt' ); Modified: trunk/BSDBuild/opengl.pm =================================================================== --- trunk/BSDBuild/opengl.pm2011-05-27 14:56:51 UTC (rev 907) +++ trunk/BSDBuild/opengl.pm2011-05-27 15:00:41 UTC (rev 908) < at >< at > -26,20 +26,26 < at >< at > my < at >autoIncludeDirs = ( '/usr/include/X11', '/usr/include/X11R6', +'/usr/include/X11R7', '/usr/local/X11/include', '/usr/local/X11R6/include', +'/usr/local/X11R7/include', '/usr/local/include/X11', '/usr/local/include/X11R6', +'/usr/local/include/X11R7', '/usr/X11/include', '/usr/X11R6/include', +'/usr/X11R7/include', '/usr/local/include', ); my < at >autoLibDirs = ( '/usr/local/X11/lib', '/usr/local/X11R6/lib', +'/usr/local/X11R7/lib', '/usr/X11/lib', '/usr/X11R6/lib', +'/usr/X11R7/lib', '/usr/local/lib', ); Modified: trunk/BSDBuild/x11.pm =================================================================== --- trunk/BSDBuild/x11.pm2011-05-27 14:56:51 UTC (rev 907) +++ trunk/BSDBuild/x11.pm2011-05-27 15:00:41 UTC (rev 908) < at >< at > -26,19 +26,25 < at >< at > my < at >autoIncludeDirs = ( '/usr/include/X11', '/usr/include/X11R6', +'/usr/include/X11R7', '/usr/local/X11/include', '/usr/local/X11R6/include', +'/usr/local/X11R7/include', '/usr/local/include/X11', '/usr/local/include/X11R6', +'/usr/local/include/X11R7', '/usr/X11/include', '/usr/X11R6/include', +'/usr/X11R7/include', ); my < at >autoLibDirs = ( '/usr/local/X11/lib', '/usr/local/X11R6/lib', +'/usr/local/X11R7/lib', '/usr/X11/lib', '/usr/X11R6/lib', +'/usr/X11R7/lib', ); sub Test [Less]

Author: vedge Date: 2011-05-19 06:31:55 -0400 (Thu, 19 May 2011) New Revision: 905 Modified: trunk/BSDBuild/getpwuid.pm Log: need <string.h> Modified: trunk/BSDBuild/getpwuid.pm ... [More] =================================================================== --- trunk/BSDBuild/getpwuid.pm2011-05-19 10:17:32 UTC (rev 904) +++ trunk/BSDBuild/getpwuid.pm2011-05-19 10:31:55 UTC (rev 905) < at >< at > -28,6 +28,7 < at >< at > sub Test { TryCompile 'HAVE_GETPWUID', << 'EOF'; +#include <string.h> #include <sys/types.h> #include <pwd.h> [Less]