[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure ACE-desktop/Makefile
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright configure ACE-desktop/Makefile |
Date: |
Mon, 05 Mar 2007 15:38:59 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/03/05 15:38:59
Modified files:
. : configure
ACE-desktop : Makefile
Log message:
Fixed installation of directory that is no longer existant. Added
--disable-ccache and --disable-distcc options to configure.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/Makefile?cvsroot=antiright&r1=1.10&r2=1.11
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- configure 4 Mar 2007 03:20:14 -0000 1.80
+++ configure 5 Mar 2007 15:38:59 -0000 1.81
@@ -25,7 +25,10 @@
#
###############################################################################
-VERSION=2.99.8
+VERSION=2.99.9
+
+USE_DISTCC=YES
+USE_CCACHE=YES
for ARG in $@; do
if [ "$ARG" = "-d" ]; then
@@ -37,6 +40,10 @@
PREFIX=~/opt/stow/antiright
elif [ "$ARG" = "-S" ]; then
PREFIX=/usr/local/stow/antiright
+ elif [ "$ARG" = "--disable-ccache" ]; then
+ USE_CCACHE=NO
+ elif [ "$ARG" = "--disable-distcc" ]; then
+ USE_DISTCC=NO
fi
done
@@ -60,16 +67,22 @@
fi
if [ "$CC" = "" ]; then
- CCACHE=$(which ccache)
- DISTCC=$(which distcc)
+
+ CC=cc
+
+ if [ "$USE_DISTCC" = "YES" ]; then
+ DISTCC="$(which distcc)"
if [ "$DISTCC" != "" ]; then
CC=$DISTCC
- else
- CC=cc
fi
+ fi
+
+ if [ "$USE_CCACHE" = "YES" ]; then
+ CCACHE="$(which ccache)"
+
+ if [ "$CCACHE" != "" ]; then
CC="$CCACHE $CC"
- if [ "$CC" = "" ]; then
- CC=cc
+ fi
fi
fi
Index: ACE-desktop/Makefile
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ACE-desktop/Makefile 4 Mar 2007 03:20:14 -0000 1.10
+++ ACE-desktop/Makefile 5 Mar 2007 15:38:59 -0000 1.11
@@ -52,7 +52,6 @@
install: all
$(INSTALL_DIR) $(bindir)
${INSTALL_DIR} $(man1dir)
- ${INSTALL_DIR} $(man2dir)
${INSTALL_DIR} $(docdir)
${INSTALL_DIR} $(datadir)
${INSTALL_DIR} $(icondir)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright configure ACE-desktop/Makefile,
Jeffrey Bedard <=