anjuta r3468 - in trunk: . global-tags

[jhs svn gnome org]

Author: jhs
Date: Mon Jan 14 13:29:23 2008
New Revision: 3468
URL: http://svn.gnome.org/viewvc/anjuta?rev=3468&view=rev

Log:
2008-01-14  Rob Bradford  <rob openedhand com>

	* global-tags/Makefile.am:
	* global-tags/create_global_tags.sh.in:
	Install anjuta-tags binary into FHS policy compliant directory and
	update references. (Fixes bug: 509346.)

Modified:
   trunk/ChangeLog
   trunk/global-tags/Makefile.am
   trunk/global-tags/create_global_tags.sh.in

Modified: trunk/global-tags/Makefile.am
==============================================================================
--- trunk/global-tags/Makefile.am	(original)
+++ trunk/global-tags/Makefile.am	Mon Jan 14 13:29:23 2008
@@ -4,8 +4,10 @@
 ## If you don't want it to overwrite it,
 ## 	Please disable it in the Anjuta project configuration
 
-bindir = $(anjuta_data_dir)/scripts
-dist_bin_SCRIPTS = create_global_tags.sh
+bindir = $(pkglibdir)
+scriptdir = $(anjuta_data_dir)/scripts
+
+script_SCRIPTS = create_global_tags.sh
 
 AM_CPPFLAGS = -I$(top_srcdir)/tagmanager/include $(GLIB_CFLAGS)
 
@@ -17,11 +19,11 @@
 anjuta_tags_LDFLAGS = $(GLIB_LIBS)
 
 edit = sed \
-	-e 's,@scriptdir\@,$(bindir),g'
+	-e 's,\ bindir\@,$(bindir),g'
 
 create_global_tags.sh: Makefile create_global_tags.sh.in
 	rm -f create_global_tags.sh
 	$(edit) $(srcdir)/create_global_tags.sh.in > create_global_tags.sh
 	chmod +x create_global_tags.sh
 
-EXTRA_DIST = $(dist_bin_SCRIPTS) create_global_tags.sh.in
+EXTRA_DIST = create_global_tags.sh.in

Modified: trunk/global-tags/create_global_tags.sh.in
==============================================================================
--- trunk/global-tags/create_global_tags.sh.in	(original)
+++ trunk/global-tags/create_global_tags.sh.in	Mon Jan 14 13:29:23 2008
@@ -6,7 +6,7 @@
     BASEDIR=`pwd`
     PROGDIR=. # `dirname $0`
     CFLAGS=""
-    ANJUTA_TAGS_BIN="@scriptdir@/anjuta-tags"
+    ANJUTA_TAGS_BIN="@bindir@/anjuta-tags"
     OUTPUT_FILE=$1
     shift