summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2009-02-03 16:56:41 -0500
committerRob Crittenden <rcritten@redhat.com>2009-02-04 09:04:26 -0500
commit240fb938d2796b0a044594d167666d1574a89726 (patch)
tree486802a6c9731123184f73b6fa291bc3db3e776f
parentd2b1a37aaf0e6ec324f156c8e4b09f2aeda9585c (diff)
downloadfreeipa-240fb938d2796b0a044594d167666d1574a89726.tar.gz
freeipa-240fb938d2796b0a044594d167666d1574a89726.tar.xz
freeipa-240fb938d2796b0a044594d167666d1574a89726.zip
Complete consolidation into a single autogen.sh
-rw-r--r--Makefile21
-rwxr-xr-xautogen.sh24
-rw-r--r--ipa.spec.in6
3 files changed, 29 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 55f9fbebc..463193aff 100644
--- a/Makefile
+++ b/Makefile
@@ -43,15 +43,9 @@ all: bootstrap-autogen server
bootstrap-autogen: version-update
@echo "Building IPA $(IPA_VERSION)"
- cd daemons; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
- cd install; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
- cd ipa-client; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
-
-autogen: version-update
- @echo "Building IPA $(IPA_VERSION)"
- cd daemons; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
- cd install; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
- cd ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR)
+ cd daemons; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
+ cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
+ cd ipa-client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
install: all server-install
@for subdir in $(SUBDIRS); do \
@@ -105,9 +99,10 @@ archive-cleanup:
tarballs: local-archive
-mkdir -p dist/sources
# tar up clean sources
- cd dist/$(TARBALL_PREFIX)/ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
- cd dist/$(TARBALL_PREFIX)/daemons; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
- cd dist/$(TARBALL_PREFIX)/install; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
+ ls dist/$(TARBALL_PREFIX)
+ cd dist/$(TARBALL_PREFIX)/ipa-client; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
+ cd dist/$(TARBALL_PREFIX)/daemons; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
+ cd dist/$(TARBALL_PREFIX)/install; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
cd dist; tar cfz sources/$(TARBALL) $(TARBALL_PREFIX)
rm -rf dist/$(TARBALL_PREFIX)
@@ -133,7 +128,7 @@ repodata:
dist: version-update archive tarballs archive-cleanup rpms repodata
-local-dist: autogen clean local-archive tarballs archive-cleanup rpms
+local-dist: bootstrap-autogen clean local-archive tarballs archive-cleanup rpms
clean: version-update
diff --git a/autogen.sh b/autogen.sh
index 014487e41..2956e51cd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
# Run this to generate all the initial makefiles, etc.
set -e
-PACKAGE=freeipa-client
+PACKAGE=freeipa
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
LIBTOOLIZE_FLAGS="--copy --force"
@@ -26,12 +26,13 @@ ARGV0=$0
# Allow invocation from a separate build directory; in that case, we change
# to the source directory to run the auto*, then change back before running configure
-srcdir=`dirname $ARGV0`
-test -z "$srcdir" && srcdir=.
+#srcdir=`dirname $ARGV0`
+#test -z "$srcdir" && srcdir=.
+srcdir="."
-ORIGDIR=`pwd`
+#ORIGDIR=`pwd`
-cd $srcdir
+#cd $srcdir
# Usage:
# compare_versions MIN_VERSION ACTUAL_VERSION
@@ -179,6 +180,13 @@ do_cmd() {
$@
}
+# I don't want a tool telling me what files I need to have
+remauto=0
+if [ ! -e AUTHORS ]; then
+ touch AUTHORS ChangeLog NEWS README
+ remauto=1
+fi
+
do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
do_cmd $ACLOCAL $ACLOCAL_FLAGS
@@ -189,7 +197,11 @@ do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
do_cmd $AUTOCONF
-cd $ORIGDIR || exit 1
+if [ $remauto -eq 1 ]; then
+ rm -f AUTHORS ChangeLog NEWS README
+fi
+
+#cd $ORIGDIR || exit 1
rm -f config.cache
diff --git a/ipa.spec.in b/ipa.spec.in
index 400cf67ef..f3f21a634 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -197,9 +197,9 @@ administering radius authentication settings in IPA.
export CFLAGS="$CFLAGS %{optflags}"
export CPPFLAGS="$CPPFLAGS %{optflags}"
make version-update
-cd ipa-client; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
-cd daemons; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
-cd install; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
+cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
+cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
+cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} version-update all
cd selinux