diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | sample/Makefile.am | 6 | ||||
| -rw-r--r-- | src/setup.c | 7 | ||||
| -rw-r--r-- | templates/Makefile.am | 13 |
6 files changed, 28 insertions, 11 deletions
@@ -5,7 +5,6 @@ .settings/ 3rd_party/ Names.txt -TODO cataract-notes.txt cgg data/ @@ -35,5 +34,6 @@ missing stamp-h1 src/.deps/ src/Makefile +TODO.txt *.o diff --git a/Makefile.am b/Makefile.am index b782c4b..76fd658 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ NULL = SUBDIRS = \ - src + src \ + templates \ + sample EXTRA_DIST = \ $(NULL) @@ -20,4 +22,4 @@ samples: ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign dist-bzip2 diff --git a/configure.ac b/configure.ac index 1829de6..1a1ea7e 100644 --- a/configure.ac +++ b/configure.ac @@ -94,10 +94,11 @@ AC_DEFINE_UNQUOTED(APP_BUILD_DATE, ["$APP_BUILD_DATE"], [build date]) AC_DEFINE_UNQUOTED(APP_COPYRIGHT_STRING, ["$APP_COPYRIGHT_STRING"], [copyright string]) + AC_CONFIG_FILES([ Makefile src/Makefile + templates/Makefile + sample/Makefile ]) AC_OUTPUT - - diff --git a/sample/Makefile.am b/sample/Makefile.am new file mode 100644 index 0000000..1ab712f --- /dev/null +++ b/sample/Makefile.am @@ -0,0 +1,6 @@ +NULL = + +EXTRA_DIST = \ + gen.sh \ + src \ + $(NULL) diff --git a/src/setup.c b/src/setup.c index 2e19acf..1481be6 100644 --- a/src/setup.c +++ b/src/setup.c @@ -62,12 +62,7 @@ find_setup_xml (TGallerySetup *setup) g_free (pth); if (b) return TRUE; - pth = g_strconcat("/usr/share/cgg/", SETUP_XML, NULL); - b = parse_setup_xml (pth, setup); - g_free (pth); - if (b) return TRUE; - - pth = g_strconcat("/usr/local/share/cgg/", SETUP_XML, NULL); + pth = g_strconcat (DATADIR, "/cgg/", SETUP_XML, NULL); b = parse_setup_xml (pth, setup); g_free (pth); return b; diff --git a/templates/Makefile.am b/templates/Makefile.am new file mode 100644 index 0000000..45c3baf --- /dev/null +++ b/templates/Makefile.am @@ -0,0 +1,13 @@ +NULL = + +templatesdir = $(datadir)/cgg + +templates_DATA = \ + scripts-general.js \ + styles.css \ + template-album.tmpl \ + template-index.tmpl \ + template-view_photo.tmpl \ + $(NULL) + +EXTRA_DIST = $(templates_DATA) |