[anjuta] project-wizard: Use pkgdatadir instead of datadir/package
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] project-wizard: Use pkgdatadir instead of datadir/package
- Date: Sat, 24 Dec 2011 09:37:34 +0000 (UTC)
commit ac8068d067d43ccfa6ca9f4abe9f7d38de41c1e4
Author: Arnel A. Borja <kyoushuu yahoo com>
Date: Sat Dec 24 13:16:24 2011 +0800
project-wizard: Use pkgdatadir instead of datadir/package
.../templates/anjuta-plugin/src/Makefile.am.tpl | 2 +-
.../templates/gtk/src/Makefile.am.tpl | 4 ++--
plugins/project-wizard/templates/gtk/src/main.c | 2 +-
.../templates/gtkapplication/src/Makefile.am.tpl | 4 ++--
.../templates/gtkapplication/src/application.c | 2 +-
.../templates/gtkmm/src/Makefile.am.tpl | 4 ++--
plugins/project-wizard/templates/gtkmm/src/main.cc | 2 +-
.../templates/minimal/Makefile.am.tpl | 2 +-
.../templates/pygtk/src/Makefile.am.tpl | 4 ++--
.../templates/vala-gtk/src/Makefile.am.tpl | 4 ++--
10 files changed, 15 insertions(+), 15 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 ac3c1f8..94ca72d 100644
--- a/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl
+++ b/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl
@@ -37,7 +37,7 @@ AM_CPPFLAGS = \
-DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" \
-DANJUTA_GLADE_DIR=\"$(anjuta_glade_dir)\" \
-DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" \
- -DPACKAGE_DATA_DIR=\"$(datadir)\" \
+ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
$(LIBANJUTA_CFLAGS)[+IF (=(get "HavePackage") "1")+] \
$([+NameCUpper+]_CFLAGS)[+ENDIF+]
diff --git a/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl
index be6cae6..0741903 100644
--- a/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl
+++ b/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl
@@ -4,7 +4,7 @@
## Created by Anjuta
[+IF (=(get "HaveBuilderUI") "1")+]
-uidir = $(datadir)/[+NameHLower+]/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = [+NameHLower+].ui
[+ENDIF+]
@@ -34,5 +34,5 @@ EXTRA_DIST = $(ui_DATA)
# Remove ui directory on uninstall
uninstall-local:
-rm -r $(uidir)
- -rm -r $(datadir)/[+NameHLower+]
+ -rm -r $(pkgdatadir)
[+ENDIF+]
diff --git a/plugins/project-wizard/templates/gtk/src/main.c b/plugins/project-wizard/templates/gtk/src/main.c
index 4abb953..43c4002 100644
--- a/plugins/project-wizard/templates/gtk/src/main.c
+++ b/plugins/project-wizard/templates/gtk/src/main.c
@@ -19,7 +19,7 @@
[+IF (=(get "HaveBuilderUI") "1")+]
/* For testing propose use the local (not installed) ui file */
-/* #define UI_FILE PACKAGE_DATA_DIR"/[+NameHLower+]/ui/[+NameHLower+].ui" */
+/* #define UI_FILE PACKAGE_DATA_DIR"/ui/[+NameHLower+].ui" */
#define UI_FILE "src/[+NameHLower+].ui"
#define TOP_WINDOW "window"
diff --git a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl
index b93ebfd..5a59ded 100644
--- a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl
+++ b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl
@@ -4,7 +4,7 @@
## Created by Anjuta
[+IF (=(get "HaveBuilderUI") "1")+]
-uidir = $(datadir)/[+NameHLower+]/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = [+NameHLower+].ui
[+ENDIF+]
@@ -36,5 +36,5 @@ EXTRA_DIST = $(ui_DATA)
# Remove ui directory on uninstall
uninstall-local:
-rm -r $(uidir)
- -rm -r $(datadir)/[+NameHLower+]
+ -rm -r $(pkgdatadir)
[+ENDIF+]
diff --git a/plugins/project-wizard/templates/gtkapplication/src/application.c b/plugins/project-wizard/templates/gtkapplication/src/application.c
index a8e99f2..07c24fa 100644
--- a/plugins/project-wizard/templates/gtkapplication/src/application.c
+++ b/plugins/project-wizard/templates/gtkapplication/src/application.c
@@ -16,7 +16,7 @@
[+IF (=(get "HaveBuilderUI") "1")+]
/* For testing propose use the local (not installed) ui file */
-/* #define UI_FILE PACKAGE_DATA_DIR"/[+NameHLower+]/ui/[+NameHLower+].ui" */
+/* #define UI_FILE PACKAGE_DATA_DIR"/ui/[+NameHLower+].ui" */
#define UI_FILE "src/[+NameHLower+].ui"
#define TOP_WINDOW "window"
[+ENDIF+]
diff --git a/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl
index ea01769..02846ea 100644
--- a/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl
+++ b/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl
@@ -4,7 +4,7 @@
## Created by Anjuta
[+IF (=(get "HaveBuilderUI") "1")+]
-uidir = $(datadir)/[+NameHLower+]/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = [+NameHLower+].ui
[+ENDIF+]
@@ -33,5 +33,5 @@ EXTRA_DIST = $(ui_DATA)
# Remove ui directory on uninstall
uninstall-local:
-rm -r $(uidir)
- -rm -r $(datadir)/[+NameHLower+]
+ -rm -r $(pkgdatadir)
[+ENDIF+]
diff --git a/plugins/project-wizard/templates/gtkmm/src/main.cc b/plugins/project-wizard/templates/gtkmm/src/main.cc
index a66b874..1f69f6e 100644
--- a/plugins/project-wizard/templates/gtkmm/src/main.cc
+++ b/plugins/project-wizard/templates/gtkmm/src/main.cc
@@ -23,7 +23,7 @@
[+IF (=(get "HaveBuilderUI") "1")+]
/* For testing propose use the local (not installed) ui file */
-/* #define UI_FILE PACKAGE_DATA_DIR"/[+NameHLower+]/ui/[+NameHLower+].ui" */
+/* #define UI_FILE PACKAGE_DATA_DIR"/ui/[+NameHLower+].ui" */
#define UI_FILE "src/[+NameHLower+].ui"
[+ENDIF+]
diff --git a/plugins/project-wizard/templates/minimal/Makefile.am.tpl b/plugins/project-wizard/templates/minimal/Makefile.am.tpl
index 73e9103..7816042 100644
--- a/plugins/project-wizard/templates/minimal/Makefile.am.tpl
+++ b/plugins/project-wizard/templates/minimal/Makefile.am.tpl
@@ -4,7 +4,7 @@
## Created by Anjuta
AM_CPPFLAGS = \
- -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/pygtk/src/Makefile.am.tpl b/plugins/project-wizard/templates/pygtk/src/Makefile.am.tpl
index b3fc234..6419029 100644
--- a/plugins/project-wizard/templates/pygtk/src/Makefile.am.tpl
+++ b/plugins/project-wizard/templates/pygtk/src/Makefile.am.tpl
@@ -3,7 +3,7 @@
## Created by Anjuta
[+IF (=(get "HaveBuilderUI") "1")+]
-uidir = $(datadir)/[+NameHLower+]/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = [+NameHLower+].ui
[+ENDIF+]
@@ -26,4 +26,4 @@ uninstall-local:
[+IF (=(get "HaveBuilderUI") "1")+]
-rm -r $(uidir)
[+ENDIF+]
- -rm -r $(datadir)/[+NameHLower+]
+ -rm -r $(pkgdatadir)
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 e9c666f..dab5bf0 100644
--- a/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl
+++ b/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl
@@ -4,7 +4,7 @@
## Created by Anjuta
[+IF (=(get "HaveBuilderUI") "1")+]
-uidir = $(datadir)/[+NameHLower+]/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = [+NameHLower+].ui
[+ENDIF+]
@@ -37,5 +37,5 @@ EXTRA_DIST = $(ui_DATA)
# Remove ui directory on uninstall
uninstall-local:
-rm -r $(uidir)
- -rm -r $(datadir)/[+NameHLower+]
+ -rm -r $(pkgdatadir)
[+ENDIF+]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]