From 9c226ebc0afaaaa87377c032e62282a3b2290012 Mon Sep 17 00:00:00 2001 From: raimi Date: Thu, 25 Nov 2004 18:58:51 +0000 Subject: [PATCH] raimi's yesterday change stefan requested the changed Makefile.am --- ChangeLog | 7 +++++++ Makefile.am | 3 +-- autogen.sh | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0464b3fd..363be572 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-24 + + * autogen.sh: Make aclocal and automake program be overridable + with environment variable. Need this so i can easily build on + debian woody, I hope nobody takes offense. + PS: While Stefan is away, I will commit his stuff. + 2004-11-11 Stefan Jahn * qucs-edit/qucsedit.cpp (slotAbout): Added proper copyright diff --git a/Makefile.am b/Makefile.am index 9166d3ec..a32f76d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,5 +32,4 @@ EXTRA_DIST = autogen.sh depcomp PLATFORMS RELEASE CLEANFILES = *~ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \ stamp-h.in stamp-h[0-9].in -DISTCLEANFILES = config.cache config.log *.gz aclocal.m4 config.h.in \ - configure +DISTCLEANFILES = config.cache config.log diff --git a/autogen.sh b/autogen.sh index 2207bc01..639b5948 100755 --- a/autogen.sh +++ b/autogen.sh @@ -26,13 +26,13 @@ here=`pwd` cd `dirname $0` echo -n "Creating aclocal.m4... " -aclocal +${ACLOCAL:-aclocal} echo "done." echo -n "Creating config.h.in... " autoheader echo "done." echo -n "Creating Makefile.in(s)... " -automake +${AUTOMAKE:-automake} echo "done." echo -n "Creating configure... " autoconf