The unified diff between revisions [6633320d..] and [3da6ddd6..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'debian/rules'

#
#
# patch "debian/rules"
#  from [a6070e2f1ba0e6c88672655b6c18880658155d5a]
#    to [11788645d4eae7869a71ea20a76df29ce520c316]
#
============================================================
--- debian/rules	a6070e2f1ba0e6c88672655b6c18880658155d5a
+++ debian/rules	11788645d4eae7869a71ea20a76df29ce520c316
@@ -18,8 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 #
-# To run this makefile in a chroot:
-# cd ..; sudo schroot --chroot=unstable -- dpkg-buildpackage -uc -us -i
+# To build this package:
+# cd ..; sudo schroot --chroot=unstable -- dpkg-buildpackage -uc -us -i"_MTN|\\.mtn-ignore"
 #
 # To run lintian:
 # cd ..; schroot --chroot=unstable -- make -f debian/rules lint
@@ -132,40 +132,24 @@ libgnade%-so: debian/libgnade%-stamp
 	dh_makeshlibs -p$(package)
 	dh_lintian -p$(package)

-# Install a -dev and -dbg package. All -dev packages add files to
-# adalib/gnade and adainclude/gnade, and there is only one project
-# file provided by libgnadecommon-dev. All other -dev packages depend
-# on it.
+# Install a -dev and -dbg package.
+libgnadecommon-dev:  package := libgnadecommon$(common_aliversion)-dev
 libgnadeodbc-dev:    package := libgnadeodbc$(odbc_aliversion)-dev
 libgnadesqlite3-dev: package := libgnadesqlite3-$(sqlite3_aliversion)-dev
 libgnade%-dev: debian/libgnade%-stamp
-	dh_installdirs -p$(package) \
-	   usr/share/ada/adainclude/gnade \
-	   usr/lib/ada/adalib/gnade
-	dh_install -p$(package) debian/tmp/$*-dynamic/*.ali usr/lib/ada/adalib/gnade
-	dh_install -p$(package) dbi/$*/*.ad[bs] usr/share/ada/adainclude/gnade
-	if [ -d debian/tmp/$*-prep ]; then dh_install -p$(package) debian/tmp/$*-prep/*.ad[bs] usr/share/ada/adainclude/gnade; fi
+	dh_installdirs -p$(package)  usr/share/ada/adainclude/gnade$* usr/lib/ada/adalib/gnade$*
+	dh_install -p$(package) debian/tmp/$*-dynamic/*.ali usr/lib/ada/adalib/gnade$*
+	if [ -d dbi/$* ]; then \
+	   dh_install -p$(package) dbi/$*/*.ad[bs] usr/share/ada/adainclude/gnade$* ; \
+	else \
+	   dh_install -p$(package) support/*.ad[bs] usr/share/ada/adainclude/gnade$* ; \
+	fi
+	if [ -d debian/tmp/$*-prep ]; then dh_install -p$(package) debian/tmp/$*-prep/*.ad[bs] usr/share/ada/adainclude/gnade$*; fi
 	dh_install -p$(package) debian/tmp/libgnade$*.a /usr/lib
-	dh_link -p$(package) /usr/lib/libgnade$*.so.$($*_soversion) \
-	   /usr/lib/libgnade$*.so
-	dh_install -p$(package) debian/$*.gpr /usr/share/ada/adainclude
+	dh_link -p$(package) /usr/lib/libgnade$*.so.$($*_soversion) /usr/lib/libgnade$*.so
+	dh_install -p$(package) debian/gnade$*.gpr /usr/share/ada/adainclude

-# Install libgnadecommon-dev; this overrides the pattern target above.
-libgnadecommon-dev: package := libgnadecommon$(common_aliversion)-dev
-libgnadecommon-dev: debian/libgnadecommon-stamp
-	dh_installdirs -p$(package) \
-	   usr/share/ada/adainclude/gnade \
-	   usr/lib/ada/adalib/gnade
-	dh_install -p$(package) debian/tmp/common-dynamic/*.ali usr/lib/ada/adalib/gnade
-	dh_install -p$(package) support/*.ad[bs] usr/share/ada/adainclude/gnade
-	dh_install -p$(package) debian/tmp/libgnadecommon.a /usr/lib
-	dh_link -p$(package) /usr/lib/libgnadecommon.so.$(common_soversion) \
-	   /usr/lib/libgnadecommon.so
-
-# check the build by running some examples running the odbc example
-# requires root privs to set it up, so we can't run it as part of the
-# package build process. We keep the target here so we can easily run
-# it while developing the next release.
+# Check the build by running some examples.
 check: patch debian/check-sqlite3-stamp

 # create 'gnade' mysql account, 'gnade' mysql database
@@ -182,6 +166,10 @@ debian/odbc-source-stamp:
 	odbcinst -i -s -l -f debian/odbc_mysql_source.ini
 	touch $@

+# Running the odbc example requires root privs to set it up, so we
+# can't run it as part of the package build process. We keep the odbc
+# target here so we can easily run it while developing the next
+# release.
 debian/check-odbc-stamp: debian/libgnadeodbc-stamp debian/odbc-source-stamp debian/tmp/odbc-example-prep/demo.adb
 	gnatmake -p -Pdebian/gnade_odbc_example_build -XLIBTYPE=dynamic
 	export LD_LIBRARY_PATH=`pwd`/debian/tmp; debian/tmp/odbc-example-obj/demo