# Install Bless in more standard locations (patch by Emmanuel Fleury).

bwrsandman · Jun 26, 2007 · 3763359 · 3763359
1 parent 739a847
commit 3763359
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 29 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,5 @@
-EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging bless.mdp bless.mds bless.spec autogen.sh
+EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \
+             bless.mdp bless.mds bless.spec autogen.sh
 
 SUBDIRS = po builder src po bin data doc tests
 
@@ -16,8 +17,10 @@ dist-hook:
 	bzr log > $(distdir)/ChangeLog
 
 install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-	$(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS README README.packaging bless.spec $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
+	$(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
+			README README.packaging bless.spec     \
+			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
diff --git a/bin/Makefile.am b/bin/Makefile.am
@@ -3,8 +3,9 @@ DLLS= $(wildcard *.dll)
 CLEANFILES= $(DLLS) bless.exe
 
 install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
-	$(INSTALL_DATA) $(DLLS) bless.exe $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
+	$(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
+	$(INSTALL_DATA) $(DLLS) bless.exe \
+			$(DESTDIR)$(libdir)/$(PACKAGE_NAME)
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
+	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -12,21 +12,23 @@ PWD=$(shell pwd)
 help_script.sh: help_script.tmpl
 	sed -e 's,@blessdocdir\@,$(PWD)/../doc,g' help_script.tmpl > help_script.sh
 	chmod +x help_script.sh
-	sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install
+	sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME),g' help_script.tmpl > help_script.sh.install
 
 install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
-	$(INSTALL_DATA) bless-about.png bless-48x48.png bless-default.layout \
-	    bless-16-bytes-per-row.layout bless-all-number-bases.layout \
-	    default-preferences.xml bless.glade \
-	    $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
+	$(INSTALL) -d $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
+	$(INSTALL_DATA) bless-about.png	bless-48x48.png     \
+			bless-default.layout 		    \
+                        bless-16-bytes-per-row.layout	    \
+			bless-all-number-bases.layout 	    \
+	    		default-preferences.xml bless.glade \
+	    		$(DESTDIR)$(datadir)/$(PACKAGE_NAME)
 	$(INSTALL) -d $(DESTDIR)$(datadir)/applications
 	$(INSTALL_DATA) bless.desktop $(DESTDIR)$(datadir)/applications
 	$(INSTALL) -d $(DESTDIR)$(datadir)/pixmaps
 	$(INSTALL_DATA) bless-48x48.png $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL_SCRIPT) help_script.sh.install $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data/help_script.sh
+	$(INSTALL_SCRIPT) help_script.sh.install $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/help_script.sh
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
+	rm -rf $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
 	rm -f $(DESTDIR)$(datadir)/applications/bless.desktop
 	rm -f $(DESTDIR)$(datadir)/pixmaps/bless-48x48.png
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS= developer user
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am
@@ -2,11 +2,10 @@ DOCS=bless.xmi
 
 dist-hook: 
 	cp --parents $(DOCS) $(distdir)
-
 
 install-data-local: 
-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
-	$(INSTALL_DATA) $(DOCS) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
+	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
+	$(INSTALL_DATA) $(DOCS) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
+	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
@@ -10,7 +10,7 @@ noinst_SCRIPTS=$(OMF)
 
 $(OMF): $(OMF).in
 	if [ -x `which scrollkeeper-preinstall` ]; then \
-	    scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/bless-manual.xml $(OMF).in $(OMF); \
+	    scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF); \
 	else \
 	    cp $(OMF).in $(OMF); \
 	fi
@@ -19,21 +19,23 @@ doc:
 	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl bless-manual.xml
 
 dist-hook: doc
-	cp --parents $(DOCS) $(OMF).in $(wildcard *.html) $(FIGURES) $(distdir)
+	cp --parents $(DOCS) $(OMF).in $(wildcard *.html) \
+		     $(FIGURES) $(distdir)
 
 install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
-	$(INSTALL_DATA) $(DOCS) $(wildcard *.html)  $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
-	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
+	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
+	$(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
+			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
 	$(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
 	$(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
 if WITH_SCROLLKEEPER
 	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
 endif
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
+	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
 	rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
 if WITH_SCROLLKEEPER
 	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -32,5 +32,5 @@ install-exec-local: bless
 	$(INSTALL_SCRIPT) bless $(DESTDIR)$(bindir)
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
+	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
 	rm -f $(DESTDIR)$(bindir)/bless
diff --git a/src/bless-script.in b/src/bless-script.in
@@ -1,3 +1,3 @@
 #!@SHELL@
 
-mono "@blesslibdir@/@PACKAGE_NAME@-@PACKAGE_VERSION@/bin/bless.exe" "$@"
+mono "@blesslibdir@/@PACKAGE_NAME@/bless.exe" "$@"