X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=40b720d22b42a73fdee43dacaed9b714a2d27366;hb=86788b19fcdd1c6be7f91c0eb7bb82e81cc2dc55;hp=6604df99f8bd2c135e37331700cc3d11b80addf7;hpb=ff21416cb3ac30f1d735593b08c3311964854070;p=clsql.git

diff --git a/debian/rules b/debian/rules
index 6604df9..40b720d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,10 @@ clc-sql		:= $(clc-source)/clsql
 lispdir-sql	:= $(clc-sql)/sql
 clc-uffi	:= $(clc-source)/clsql-uffi
 lispdir-uffi 	:= $(clc-uffi)/uffi
-sodir-uffi 	:= usr/lib
+sodir-uffi 	:= usr/lib/clsql
 clc-mysql	:= $(clc-source)/clsql-mysql
 lispdir-mysql	:= $(clc-mysql)/db-mysql
-sodir-mysql	:= usr/lib
+sodir-mysql	:= usr/lib/clsql
 clc-pg		:= $(clc-source)/clsql-postgresql
 lispdir-pg	:= $(clc-pg)/db-postgresql
 clc-pg-socket 	:= $(clc-source)/clsql-postgresql-socket
@@ -68,24 +68,18 @@ lispdir-tests	:= $(clc-tests)/tests
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
 	touch configure-stamp
 
 
 build-arch: configure-stamp build-arch-stamp
 build-arch-stamp:
 	dh_testdir
-	# Add here commands to compile the package.
 	$(MAKE)
 	touch build-arch-stamp
 
 build-indep: configure-stamp  build-indep-stamp
 build-indep-stamp:
 	dh_testdir
-	# Add here command to compile/build the arch indep package.
-	# It's ok not to do anything here, if you don't need to build
-	#  anything for this package.
-	#/usr/bin/docbook-to-man debian/#PACKAGE#.sgml > #PACKAGE#.1
 	touch build-indep-stamp
 
 build: build-arch build-indep
@@ -94,8 +88,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
 	dh_clean
 
@@ -103,12 +96,11 @@ install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
-	# Add here commands to install the package into debian/uffi.
 	dh_installdirs --all  $(clc-systems) $(clc-source)
-	dh_installdirs -p $(pkg) $(lispdir-sql)
+	dh_installdirs -p $(pkg) $(lispdir-sql) etc
 	dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-uffi)
 	dh_installdirs -p $(pkg-pg) $(lispdir-pg)
 	dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
@@ -123,6 +115,7 @@ install: build
 	# Main package
 	dh_install -p $(pkg) $(srcs) $(lispdir-sql)
 	dh_install -p $(pkg) clsql.asd $(clc-clsql)
+	dh_install -p $(pkg) debian/clsql-init.lisp etc
 
 	# UFFI
 	dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
@@ -187,30 +180,19 @@ install: build
 	done
 
 
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-#	dh_installdebconf -i
 	dh_installdocs -i
 	dh_installexamples -i examples/*
 	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
 	dh_installcron -i
-#	dh_installman -i
 	dh_installinfo -i
-#	dh_undocumented -i
 	dh_installchangelogs ChangeLog -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-#	dh_perl -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -219,27 +201,17 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-#	dh_installdebconf -a
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installmenu -a
-#	dh_installlogrotate -a
-#	dh_installemacsen -a
-#	dh_installpam -a
-#	dh_installmime -a
-#	dh_installinit -a
 	dh_installcron -a
-#	dh_installman -a
 	dh_installinfo -a
-#	dh_undocumented -a
 	dh_installchangelogs ChangeLog -a
 	dh_strip -a
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-#	dh_makeshlibs -a
 	dh_installdeb -a
-#	dh_perl -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
@@ -248,4 +220,3 @@ binary-arch: build install
 binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install configure
-