>From a96d1010f6bb9cbb15c1dcbba51bde8e2867e841 Mon Sep 17 00:00:00 2001 From: "Arnel A. Borja" Date: Wed, 21 Dec 2011 06:54:57 +0800 Subject: [PATCH 4/6] project-wizard: Use Automake variables for defines - Use equivalent Automake variables directly for PACKAGE_LOCALE_DIR - Make PACKAGE_DATA_DIR point to the real package data directory --- .../templates/anjuta-plugin/src/Makefile.am.tpl | 2 +- .../templates/cpp/src/Makefile.am.tpl | 4 ++-- .../templates/gtk/src/Makefile.am.tpl | 6 +++--- .../templates/gtkapplication/src/Makefile.am.tpl | 4 ++-- .../templates/gtkmm/src/Makefile.am.tpl | 4 ++-- .../templates/library/src/Makefile.am.tpl | 4 ++-- .../templates/sdl/src/Makefile.am.tpl | 4 ++-- .../templates/terminal/src/Makefile.am.tpl | 4 ++-- .../templates/vala-gtk/src/Makefile.am.tpl | 6 +++--- .../templates/wxwin/src/Makefile.am.tpl | 4 ++-- .../templates/xlib-dock/src/Makefile.am.tpl | 4 ++-- .../templates/xlib/src/Makefile.am.tpl | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl b/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl index a30d76a..8ad3db3 100644 --- a/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl @@ -31,7 +31,7 @@ plugin_in_files = [+NameHLower+].plugin.in # Include paths AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" \ -DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" \ -DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" \ diff --git a/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl b/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl index 8ac1b8a..7beab16 100644 --- a/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl @@ -4,9 +4,9 @@ ## Created by Anjuta AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl index 5e1db2e..be6cae6 100644 --- a/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl @@ -9,9 +9,9 @@ ui_DATA = [+NameHLower+].ui [+ENDIF+] AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ $([+NameCUpper+]_CFLAGS) AM_CFLAGS =\ @@ -35,4 +35,4 @@ EXTRA_DIST = $(ui_DATA) uninstall-local: -rm -r $(uidir) -rm -r $(datadir)/[+NameHLower+] -[+ENDIF+] \ No newline at end of file +[+ENDIF+] diff --git a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl index a286752..b93ebfd 100644 --- a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl @@ -9,9 +9,9 @@ ui_DATA = [+NameHLower+].ui [+ENDIF+] AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ $([+NameCUpper+]_CFLAGS) AM_CFLAGS =\ diff --git a/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl index 437ec3f..ea01769 100644 --- a/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl @@ -9,9 +9,9 @@ ui_DATA = [+NameHLower+].ui [+ENDIF+] AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ $([+NameCUpper+]_CFLAGS) AM_CFLAGS =\ diff --git a/plugins/project-wizard/templates/library/src/Makefile.am.tpl b/plugins/project-wizard/templates/library/src/Makefile.am.tpl index 9b10dc0..7d580cb 100644 --- a/plugins/project-wizard/templates/library/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/library/src/Makefile.am.tpl @@ -4,9 +4,9 @@ ## Created by Anjuta AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/sdl/src/Makefile.am.tpl b/plugins/project-wizard/templates/sdl/src/Makefile.am.tpl index 904361f..a2e4e0b 100644 --- a/plugins/project-wizard/templates/sdl/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/sdl/src/Makefile.am.tpl @@ -4,9 +4,9 @@ ## Created by Anjuta AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl b/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl index 6231bf9..2661f54 100644 --- a/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl @@ -4,9 +4,9 @@ ## Created by Anjuta AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl b/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl index 78b97b7..e9c666f 100644 --- a/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl @@ -9,9 +9,9 @@ ui_DATA = [+NameHLower+].ui [+ENDIF+] AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ $([+NameCUpper+]_CFLAGS) AM_CFLAGS =\ @@ -38,4 +38,4 @@ EXTRA_DIST = $(ui_DATA) uninstall-local: -rm -r $(uidir) -rm -r $(datadir)/[+NameHLower+] -[+ENDIF+] \ No newline at end of file +[+ENDIF+] diff --git a/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl b/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl index 8c826d8..325cad0 100644 --- a/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl @@ -5,9 +5,9 @@ AM_CPPFLAGS = \ $(WX_CXXFLAGS) \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall \ diff --git a/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl b/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl index 8b70eaf..3a71757 100644 --- a/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl @@ -4,9 +4,9 @@ ## Created by Anjuta AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl b/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl index eba49b4..6fe27a1 100644 --- a/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl @@ -4,9 +4,9 @@ ## Created by Anjuta AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ -- 1.7.5.4