From: Jim Evins <evins@snaught.com>
Date: Sat, 7 Aug 2004 20:56:36 +0000 (+0000)
Subject: 2004-08-07  Jim Evins  <evins@snaught.com>
X-Git-Tag: glabels-2_3_0~461
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a1220b934f65cb92dc9f70f4a56202f5dcc990c3;p=glabels

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 e774ad95..ce2592e2 100644
--- 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 c3c6a89f..0c5dc4b1 100644
--- 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 32279af9..88c72ddb 100644
--- 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
 ])