2004-08-07 Jim Evins <evins@snaught.com>

	* Makefile.am:
	* configure.in:
	* help/*
		Renamed "./doc" directory to "./help" which contains user documentation,
		to be more consistent with other GNOME applications.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@436 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index e774ad95a97e8aad73bd8ff0040876babeb48300..ce2592e2f68b975e9262e44f21fd07a58580a58f 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-07  Jim Evins  <evins@snaught.com>
+
+       * Makefile.am:
+       * configure.in:
+       * help/*
+               Renamed "./doc" directory to "./help" which contains user documentation,
+               to be more consistent with other GNOME applications.
+       
+
 2004-07-26  Jim Evins  <evins@snaught.com>
 
        * src/merge-properties-dialog.c: (gl_merge_properties_dialog_init):

diff --git a/glabels2/Makefile.am b/glabels2/Makefile.am
index c3c6a89f3847779aa053b0086a0004f20073b87f..0c5dc4b11a528c15ee23916da034282588bda67c 100644 (file)
--- a/glabels2/Makefile.am
+++ b/glabels2/Makefile.am
@@ -2,7 +2,7 @@
 
 LIB_BARCODE_DIR = barcode-0.98
 
-SUBDIRS = po $(LIB_BARCODE_DIR) libglabels src data pixmaps doc
+SUBDIRS = po $(LIB_BARCODE_DIR) libglabels src data pixmaps help
 
 EXTRA_DIST = \
        README \

diff --git a/glabels2/configure.in b/glabels2/configure.in
index 32279af96850e9ff3f65da99bea421a3a736c5e4..88c72ddbcaaee2d33495a3b16dc5761f5c947770 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -95,8 +95,8 @@ src/recent-files/Makefile
 pixmaps/Makefile
 data/Makefile
 po/Makefile.in
-doc/Makefile
-doc/C/Makefile
+help/Makefile
+help/C/Makefile
 glabels.spec
 ])