[gnome-system-tools] Use directory variables when building (fix broken jhbuild)

[Milan Bouchet-Valat <milanbv src gnome org>]

commit bfd3ba39ed168f3f28a09ff400520e3f88d8dea3
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Sun Jul 26 17:16:04 2009 +0200

    Use directory variables when building (fix broken jhbuild)
    
    The standard way of using installation directory variables is to define them at make time, rather than in configure.in. Using standard autotools dirs also allows changing the prefix without running configure again.
    
    This fixes the build using jhbuild: make install now uses the right prefix.

 DirsMakefile              |   11 +++++++++++
 configure.in              |   27 ---------------------------
 interfaces/Makefile.am    |    2 ++
 src/common/CommonMakefile |    2 ++
 src/common/Makefile.am    |    4 +++-
 src/disks/Makefile.am     |    2 +-
 src/network/Makefile.am   |    2 +-
 src/services/Makefile.am  |    2 +-
 src/shares/Makefile.am    |    2 +-
 src/time/Makefile.am      |    2 +-
 src/users/Makefile.am     |    2 +-
 11 files changed, 24 insertions(+), 34 deletions(-)
---
diff --git a/DirsMakefile b/DirsMakefile
new file mode 100644
index 0000000..764734c
--- /dev/null
+++ b/DirsMakefile
@@ -0,0 +1,11 @@
+# Set the common directories.
+# This file is included in src/common/CommonMakefile,
+# in src/common/Makefile.am and in interfaces/Makefile.am
+
+pixmapsdir = $(pkgdatadir)/pixmaps
+interfacesdir = $(pkgdatadir)/ui
+
+INCLUDES = -DPIXMAPS_DIR=\""$(pixmapsdir)"\"		\
+	   -DINTERFACES_DIR=\""$(interfacesdir)"\"	\
+	   -DFRONTEND_DIR=\""$(frontenddir)"\"		\
+	   -DDESKTOP_DATA_DIR=\""$(desktopdatadir)"\"
diff --git a/configure.in b/configure.in
index 27306b3..96d91de 100644
--- a/configure.in
+++ b/configure.in
@@ -167,33 +167,6 @@ dnl ========================================================
 dnl END : Translations
 dnl ========================================================
 
-dnl ========================================================
-dnl Set dirs
-dnl ========================================================
-
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
-  pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-  AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/ui", [path where UI files will be installed])
-  interfacesdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/ui"
-  AC_DEFINE_UNQUOTED(FRONTEND_DIR,"${ac_default_prefix}/${BINDIRNAME}", [frontend files path])
-  AC_DEFINE_UNQUOTED(DESKTOP_DATA_DIR,"${ac_default_prefix}/${DATADIRNAME}/control-center-2.0/capplets", [capplets directory])
-else
-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
-  pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-  AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/ui", [path where UI files will be installed])
-  interfacesdir="${prefix}/${DATADIRNAME}/${PACKAGE}/ui"
-  AC_DEFINE_UNQUOTED(FRONTEND_DIR,"${prefix}/${BINDIRNAME}", [frontend files path])
-  AC_DEFINE_UNQUOTED(DESKTOP_DATA_DIR,"${prefix}/${DATADIRNAME}/control-center-2.0/capplets", [capplets directory])
-fi
-
-AC_SUBST(pixmapsdir)
-AC_SUBST(interfacesdir)
-
-dnl ==============================================================
-dnl END: Set dirs
-dnl ==============================================================
-
 dnl =====================================================
 dnl GCONF
 dnl =====================================================
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 5e51cd8..97b8fa7 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/DirsMakefile
+
 interfaces = \
 	common.ui	\
 	network.ui	\
diff --git a/src/common/CommonMakefile b/src/common/CommonMakefile
index 6fa599e..6bfb2ff 100644
--- a/src/common/CommonMakefile
+++ b/src/common/CommonMakefile
@@ -1,3 +1,5 @@
+include $(top_srcdir)/DirsMakefile
+
 desktop = $(toolname).desktop
 desktopdir = $(datadir)/applications/
 desktop_in_files = $(desktop).in
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 6226049..87a3c84 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,6 +1,8 @@
+include $(top_srcdir)/DirsMakefile
+
 noinst_LIBRARIES = libsetuptool.a
 
-INCLUDES = \
+INCLUDES += \
 	$(GST_CFLAGS) \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)"\" \
diff --git a/src/disks/Makefile.am b/src/disks/Makefile.am
index 20066a1..7d18c44 100644
--- a/src/disks/Makefile.am
+++ b/src/disks/Makefile.am
@@ -11,7 +11,7 @@ toolname = disks
 bin_PROGRAMS = disks-admin
 
 ## SUBDIRS =
-INCLUDES = -Wall $(GST_TOOL_CFLAGS)
+INCLUDES += -Wall $(GST_TOOL_CFLAGS)
 CLEANFILES = $(GST_TOOL_CLEANFILES)
 EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
 
diff --git a/src/network/Makefile.am b/src/network/Makefile.am
index 7c98e8c..f860b8c 100644
--- a/src/network/Makefile.am
+++ b/src/network/Makefile.am
@@ -11,7 +11,7 @@ toolname = network
 bin_PROGRAMS = network-admin
 
 ## SUBDIRS =
-INCLUDES = $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS) $(GIO_CFLAGS)
+INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS) $(GIO_CFLAGS)
 CLEANFILES = $(GST_TOOL_CLEANFILES)
 EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
 
diff --git a/src/services/Makefile.am b/src/services/Makefile.am
index da0d222..9789aab 100644
--- a/src/services/Makefile.am
+++ b/src/services/Makefile.am
@@ -11,7 +11,7 @@ toolname = services
 bin_PROGRAMS = services-admin
 
 ## SUBDIRS =
-INCLUDES = $(GST_TOOL_CFLAGS)
+INCLUDES += $(GST_TOOL_CFLAGS)
 CLEANFILES = $(GST_TOOL_CLEANFILES)
 EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
 
diff --git a/src/shares/Makefile.am b/src/shares/Makefile.am
index 500a459..cee41e2 100644
--- a/src/shares/Makefile.am
+++ b/src/shares/Makefile.am
@@ -14,7 +14,7 @@ if BUILD_NAUTILUS
 SUBDIRS = nautilus
 endif
 
-INCLUDES = $(GST_TOOL_CFLAGS)
+INCLUDES += $(GST_TOOL_CFLAGS)
 CLEANFILES = $(GST_TOOL_CLEANFILES)
 EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
 
diff --git a/src/time/Makefile.am b/src/time/Makefile.am
index bb6644b..fb21a20 100644
--- a/src/time/Makefile.am
+++ b/src/time/Makefile.am
@@ -11,7 +11,7 @@ toolname = time
 bin_PROGRAMS = time-admin
 
 SUBDIRS = e-map
-INCLUDES = $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
+INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
 CLEANFILES = $(GST_TOOL_CLEANFILES)
 EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
 
diff --git a/src/users/Makefile.am b/src/users/Makefile.am
index 1599a43..1b034bf 100644
--- a/src/users/Makefile.am
+++ b/src/users/Makefile.am
@@ -11,7 +11,7 @@ toolname = users
 bin_PROGRAMS = users-admin
 
 SUBDIRS = 
-INCLUDES = $(GST_TOOL_CFLAGS)
+INCLUDES += $(GST_TOOL_CFLAGS)
 CLEANFILES = $(GST_TOOL_CLEANFILES)
 EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)