Author: vedge
Date: 2008-10-21 11:24:15 -0300 (Tue, 21 Oct 2008)
New Revision: 750
Modified:
trunk/build.prog.mk
trunk/mkconfigure.pl
Log:
use ${EXECSUFFIX} in make install
Modified: trunk/build.prog.mk
===================================================================
--- trunk/build.prog.mk 2008-10-21 14:10:38 UTC (rev 749)
+++ trunk/build.prog.mk 2008-10-21 14:24:15 UTC (rev 750)
@@ -277,8 +277,8 @@
echo "rm -f ${POBJS}"; \
rm -f ${OBJS}; \
fi; \
- echo "rm -f ${PROG} ${GMONOUT} ${WINRES}.o"; \
- rm -f ${PROG} ${GMONOUT} ${WINRES}.o; \
+ echo "rm -f ${PROG}${EXECSUFFIX} ${GMONOUT} ${WINRES}.o"; \
+ rm -f ${PROG}${EXECSUFFIX} ${GMONOUT} ${WINRES}.o; \
fi
@if [ "${CLEANFILES}" != "" ]; then \
echo "rm -f ${CLEANFILES}"; \
@@ -300,8 +300,8 @@
${SUDO} ${INSTALL_PROG_DIR} ${BINDIR}; \
fi
@if [ "${PROG}" != "" -a "${PROG_INSTALL}" != "No" ]; then \
- echo "${INSTALL_PROG} ${PROG} ${BINDIR}"; \
- ${SUDO} ${INSTALL_PROG} ${PROG} ${BINDIR}; \
+ echo "${INSTALL_PROG} ${PROG}${EXECSUFFIX} ${BINDIR}"; \
+ ${SUDO} ${INSTALL_PROG} ${PROG}${EXECSUFFIX} ${BINDIR}; \
fi
@if [ "${SHARE}" != "none" ]; then \
if [ ! -d "${SHAREDIR}" ]; then \
@@ -359,8 +359,8 @@
deinstall-prog:
@if [ "${PROG}" != "" -a "${PROG_INSTALL}" != "No" ]; then \
- echo "${DEINSTALL_PROG} ${BINDIR}/${PROG}"; \
- ${SUDO} ${DEINSTALL_PROG} ${BINDIR}/${PROG}; \
+ echo "${DEINSTALL_PROG} ${BINDIR}/${PROG}${EXECSUFFIX}"; \
+ ${SUDO} ${DEINSTALL_PROG} ${BINDIR}/${PROG}${EXECSUFFIX}; \
fi
@if [ "${SHARE}" != "none" ]; then \
for F in ${SHARE}; do \
Modified: trunk/mkconfigure.pl
===================================================================
--- trunk/mkconfigure.pl 2008-10-21 14:10:38 UTC (rev 749)
+++ trunk/mkconfigure.pl 2008-10-21 14:24:15 UTC (rev 750)
@@ -86,17 +86,11 @@
my $subdir = shift;
print << "EOF";
-#
-# Preprocess headers for visibility and calling convention stuff. Developers
-# can use the unpreprocessed headers directly with --includes=link.
-#
-if [ ! -e "$dir" ]; then
- mkdir "$dir"
-fi
+if [ ! -e "$dir" ]; then mkdir "$dir"; fi
if [ "\${includes}" = "link" ]; then
echo "* Not preprocessing includes"
if [ ! -e "$dir/$subdir" ]; then
- if [ "\${srcdir}" != "" ]; then
+ if [ "\${SRCDIR}" != "\${BLDDIR}" ]; then
ln -s "\$SRC" "$dir/$subdir"
else
ln -s "\$BLD" "$dir/$subdir"
@@ -105,11 +99,11 @@
else
if [ ! -e "$dir/$subdir" ]; then
\$ECHO_N "* Preprocessing includes..."
- if [ "\${srcdir}" != "" ]; then
+ if [ "\${SRCDIR}" != "\${BLDDIR}" ]; then
(cd \$SRC && perl mk/gen-includes.pl
"\$BLD/$dir/$subdir" 1>>\$BLD/config.log 2>&1)
cp -fR config $dir/$subdir
else
- perl mk/gen-includes.pl "$dir/$subdir" 1>config.log 2>&1
+ perl mk/gen-includes.pl "$dir/$subdir" 1>>config.log
2>&1
fi
if [ \$? != 0 ]; then
echo "perl mk/gen-includes.pl failed";
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
