From 0421dfcb0c586be3bba96bda86bc0934b5070ddf Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Sun, 16 Jan 2011 10:01:57 +0100 Subject: [PATCH] [build] Corrected bug in glade catalog dir $datarootdir, a component of the GLADE_CATALOGDIR substitution, yet contains $DESTDIR so it must not be specified again in the makefile. Also, added an optional line on the configure report to show the value of GLADE_CATALOGDIR for debugging purpose. This bug has been exposed by the PKG_BUILD of speps (adg-0.6.2-1) in the archlinux AUR repository: http://aur.archlinux.org/packages.php?ID=45251 --- configure.ac | 8 +++++++- src/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fe7ed52d..8c2d81cb 100644 --- a/configure.ac +++ b/configure.ac @@ -205,6 +205,12 @@ AC_OUTPUT # Report +AS_IF([test "x${enable_glade}" != "xno"], + [report_glade_catalogdir=" + Glade catalog dir: ${GLADE_CATALOGDIR}"], + [report_glade_catalogdir='']) + + AC_MSG_NOTICE([generating report AC_PACKAGE_NAME adg_version will be built with the following options: @@ -212,7 +218,7 @@ AC_PACKAGE_NAME adg_version will be built with the following options: API compatibility: adg_api_version CPML library to use: internal (cpml-adg_version) GTK+2 additional widgets: ${enable_gtk2} - Install glade catalogs: ${enable_glade} + Install glade catalogs: ${enable_glade}${report_glade_catalogdir} Build API reference: ${enable_gtk_doc} Test framework support: ${enable_test_framework} ]) diff --git a/src/Makefile.am b/src/Makefile.am index 5585e176..35901ca4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS+= adg-gtk endif if HAVE_GLADE -adg_catalogdir= $(DESTDIR)$(GLADE_CATALOGDIR) +adg_catalogdir= $(GLADE_CATALOGDIR) adg_catalog_DATA= adg.xml endif -- 2.11.4.GIT