X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8cdf81e9b6cf4582c2ff7cf0f01f8b5ce4fbc323..1d9fd7a2528bfb3ce95cfe65c227fafa912f38e8:/debian/rules

diff --git a/debian/rules b/debian/rules
index d73089fb3..68f0427d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.13 1999/03/23 20:26:39 che Exp $
+# $Id: rules,v 1.22 2000/06/04 05:36:15 doogie Exp $
 
 
 # For the deb builder, you can run 'debian/rules cvs-build', which does all
@@ -12,10 +12,25 @@
 # create ../upload-<VER>, with all the files needed to be uploaded placed
 # in it.
 
-DEB_BUILD_PROG:=debuild
+DEB_BUILD_PROG:=debuild -us -uc
 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
 
+# Determine the build directory to use
+BASE=.
+ifdef BUILD
+BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)
+else
+BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build
+endif
+BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))
+BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX))))
+override BLD := $(BUILDX)
+
+ifeq ($(words $(BLD)),0)
+override BLD := ./build
+endif
+
 ifneq ($(APT_DEBVER),$(APT_CONFVER))
 .PHONY: configure.in
 configure.in:
@@ -29,10 +44,10 @@ endif
 
 # Find the libapt-pkg major version for use in other control files
 export LIBAPT_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2)
-#debian/shlibs.local:
-#	rm -f $@
-#	echo "libapt-pkg $(LIBAPT_MAJOR) libapt-pkg$(LIBAPT_MAJOR)" >> $@
-#	echo "libapt-pkg $(LIBAPT_MAJOR) apt $(APT_DEBVER)" >> $@
+debian/shlibs.local: apt-pkg/makefile
+	rm -f $@
+	echo "libapt-pkg $(LIBAPT_MAJOR) libapt-pkg$(LIBAPT_MAJOR)" >> $@
+	echo "libapt-pkg $(LIBAPT_MAJOR) apt $(APT_DEBVER)" >> $@
 
 build: build-stamp
 build-stamp: configure
@@ -42,15 +57,15 @@ build-stamp: configure
 #	cd build && CXXFLAGS="-g -Wall -D_POSIX_C_SOURCE=199309" ../configure --disable-nls --disable-static --prefix=/usr
 #	cd build && make all-hdr
 #	cd build && make -s
-	
+
 	# Add here commands to compile the package.
-	make
+	$(MAKE)
 	touch build-stamp
 
 clean:
 	dh_testdir
 #	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp debian/shlibs.local
 	rm -rf build
 
 	# Add here commands to clean up after the build process.
@@ -67,16 +82,18 @@ libapt-pkg-doc: build debian/shlibs.local
 	dh_installdirs -p$@
 #
 # libapt-pkg-doc install
-#
-	cp -a build/docs/cache* build/docs/design* build/docs/dpkg-tech* \
-	  build/docs/files* build/docs/method* debian/libapt-pkg-doc/usr/doc/apt/
-	cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/doc/libapt-pkg-doc/.dhelp
-	dh_installdocs -p$@
+#	
+	dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
+                            $(BLD)/docs/files* $(BLD)/docs/method*
+			    
+	-cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/doc/libapt-pkg-doc/.dhelp
+	-cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/share/doc/libapt-pkg-doc/.dhelp
+	
 	dh_installexamples -p$@
 #	dh_installmenu -p$@
 #	dh_installinit -p$@
 #	dh_installcron -p$@
-	dh_installmanpages -p$@
+#	dh_installmanpages -p$@
 
 #	dh_undocumented -p$@
 	dh_installchangelogs -p$@
@@ -101,44 +118,33 @@ apt: build debian/shlibs.local
 #
 # apt install
 #
-	cp build/bin/apt-* debian/tmp/usr/bin/
+	cp $(BLD)/bin/apt-* debian/tmp/usr/bin/
 	
 	# install the shared libs
-	find build/bin/ -type f -name "libapt-pkg.so.*" -exec cp -a "{}" debian/tmp/usr/lib/ \;
-	find build/bin/ -type l -name "libapt-pkg.so.*" -exec cp -a "{}" debian/tmp/usr/lib/ \;
+	find $(BLD)/bin/ -type f -name "libapt-pkg.so.*" -exec cp -a "{}" debian/tmp/usr/lib/ \;
+	find $(BLD)/bin/ -type l -name "libapt-pkg.so.*" -exec cp -a "{}" debian/tmp/usr/lib/ \;
 
-	cp build/bin/methods/* debian/tmp/usr/lib/apt/methods/
+	cp $(BLD)/bin/methods/* debian/tmp/usr/lib/apt/methods/
 
-	cp build/scripts/dselect/* debian/tmp/usr/lib/dpkg/methods/apt/
-#	cp debian/sources.list debian/tmp/etc/apt/
+	cp $(BLD)/scripts/dselect/* debian/tmp/usr/lib/dpkg/methods/apt/
 
-	# Copy the users guide	
-	cp build/docs/guide.text debian/tmp/usr/doc/apt/users-guide.txt
-	cp -a build/docs/guide.html/* debian/tmp/usr/doc/apt/users-guide.html/
-	
-	# Copy the offline guide	
-	cp build/docs/offline.text debian/tmp/usr/doc/apt/offline.txt
-	cp -a build/docs/offline.html/* debian/tmp/usr/doc/apt/offline.html/
+	# Copy the guides
+	dh_installdocs -p$@ $(BLD)/docs/guide.text $(BLD)/docs/guide.html \
+	               $(BLD)/docs/offline.text $(BLD)/docs/offline.html
 	
-	cp -a debian/dhelp debian/tmp/usr/doc/apt/.dhelp
+	# One or the other..
+	-cp -a debian/dhelp debian/tmp/usr/doc/apt/.dhelp
+	-cp -a debian/dhelp debian/tmp/usr/share/doc/apt/.dhelp 
 	
 #	head -n 500 ChangeLog > debian/ChangeLog
 
-
-
-	dh_installdocs -p$@
-	dh_installexamples -papt build/docs/examples/*
-#	dh_installmenu -papt
-#	dh_installinit -papt
-#	dh_installcron -papt
+	dh_installexamples -p$@ $(BLD)/docs/examples/*
 	dh_installmanpages -p$@
 
-#	dh_undocumented -papt
 	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
-#	dh_suidregister -p$@
 	dh_installdeb -p$@
 	LD_LIBRARY_PATH=`pwd`/debian/tmp/usr/lib dh_shlibdeps -papt
 	dh_gencontrol -p$@ -u -Vlibapt-pkg:major=${LIBAPT_MAJOR}
@@ -154,14 +160,15 @@ libapt-pkg-dev: build debian/shlibs.local
 #
 # libapt-pkg-dev install
 #
-	ln -s libapt-pkg.so.${LIBAPT_MAJOR} debian/libapt-pkg-dev/usr/lib/libapt-pkg.so
-	cp build/include/apt-pkg/*.h debian/libapt-pkg-dev/usr/include/apt-pkg/
+	cp -a $(BLD)/bin/libapt-pkg.so debian/libapt-pkg-dev/usr/lib/
+	#ln -s libapt-pkg.so.${LIBAPT_MAJOR} debian/libapt-pkg-dev/usr/lib/libapt-pkg.so
+	cp $(BLD)/include/apt-pkg/*.h debian/libapt-pkg-dev/usr/include/apt-pkg/
 
 	dh_installdocs -p$@
-#	dh_installmenu -papt
-#	dh_installinit -papt
-#	dh_installcron -papt
-	dh_installmanpages -p$@
+#	dh_installmenu -p$@
+#	dh_installinit -p$@
+#	dh_installcron -p$@
+#	dh_installmanpages -p$@
 
 	dh_installchangelogs -p$@
 	dh_strip -p$@
@@ -185,7 +192,7 @@ l33ch: really-clean
 super-l33ch: l33ch Makefile.in
 
 configure:
-	make configure
+	$(MAKE) configure
 
 l33ch-stamp: super-l33ch
 	touch l33ch-stamp
@@ -210,8 +217,8 @@ cvs-build:
 	rm -rf debian/cvs-build
 	cvs update
 	buildlib/mkChangeLog
-	make startup
-	make doc
+	$(MAKE) startup
+	$(MAKE) doc
 	tar c --exclude CVS --exclude debian/cvs-build . |\
 		(mkdir -p debian/cvs-build/apt-$(APT_DEBVER);cd debian/cvs-build/apt-$(APT_DEBVER);tar x)
 # The next line isn't needed, as debuild will make the .tar.gz for us.