[gimp-help-2: 1/3] Enable packaging and installing

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit 2c07c7a02a7a71b93e4cbf0d71fd25b757afd6c3
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Sat May 9 13:03:30 2009 +0200

    Enable packaging and installing
    
    The old make targets 'gimp-help-2-html-LL.tar' and
    'install-data-local' are modified and re-activated;
    no corresponding targets for Makefile.GNU so far.
---
 Makefile.am  |   78 ++++++++++++++++++++++++---------------------------------
 configure.ac |    1 +
 2 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b928032..9212081 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -724,16 +724,16 @@ draft-po/%.po:   preview-po/%.po   ;
 ####        Language-specific HTML tarballs for distribution        ####
 ########################################################################
 
-tarball_prefix := gimp-help-2-html
+tarball_prefix = gimp-help-2-html
+tarball_dir    = gimp-help-2
 
 .SECONDARY: $(tarball_prefix)-%.tar
 $(tarball_prefix)-%.tar: html/%/index.html html/%/gimp-help.xml
-	$(cmd) rm -rf $(tarball_prefix)-$*
-	$(cmd) $(MKDIR_P) $(tarball_prefix)-$*
-	$(cmd) cd $(tarball_prefix)-$* && $(LN_S) ../html/$* .
-	$(cmd) cd $(tarball_prefix)-$* && $(LN_S) ../html/images .
-	$(cmd) tar -chf $@ --exclude .git $(tarball_prefix)-$*
-	$(cmd) rm -rf $(tarball_prefix)-$*
+	$(cmd) rm -rf $(tarball_dir)/html
+	$(cmd) $(MKDIR_P) $(tarball_dir)/html
+	$(cmd) cd $(tarball_dir)/html && $(LN_S) ../../html/$* .
+	$(cmd) tar -chf $@ $(tarball_dir)/html/$*
+	$(cmd) rm -rf $(tarball_dir)
 
 $(tarball_prefix)-%.tar.gz: $(tarball_prefix)-%.tar
 	gzip -c9 $< > $@
@@ -755,6 +755,32 @@ html-dist: \
 
 
 ########################################################################
+####            Installation                                        ####
+########################################################################
+
+install-data-local:
+	$(cmd) $(MKDIR_P) $(DESTDIR)$(helpdir) || exit 77
+	$(cmd) $(echo_n) "*** Installing HTML:"
+	$(cmd) cd html && \
+	for lang in $(ALL_LINGUAS); do \
+		$(echo_n) " $${lang}"; \
+		tar -chf- $${lang} | \
+		(cd $(DESTDIR)$(helpdir)/ && tar -xf-) || exit 70; \
+	done; \
+	echo .
+
+uninstall-local:
+	$(cmd) rm -rf $(DESTDIR)$(helpdir)/*
+	$(cmd) dir=$(DESTDIR)$(helpdir); \
+	while [ -d "$${dir}" ]; do \
+		rmdir $${dir} 2>/dev/null \
+		&& echo removed $${dir} \
+		&& dir=$${dir%/*} \
+		|| break; \
+	done
+
+
+########################################################################
 ####            Source file checks                                  ####
 ########################################################################
 
@@ -783,44 +809,6 @@ check-images-en check-images-C: check-image-references ;
 .PHONY: checks check-image-references
 
 
-
-
-## TODO ## #### Installation
-## TODO ## 
-## TODO ## install-data-local:
-## TODO ## 	$(MKDIR_P) $(DESTDIR)$(helpdir)
-## TODO ## 
-## TODO ## 	@$(echo_n) "** Installing HTML:"
-## TODO ## 	@cd html && \
-## TODO ## 	for lang in $(ALL_LINGUAS); do \
-## TODO ## 		$(MKDIR_P) $(DESTDIR)$(helpdir)/$$lang && $(echo_n) " $$lang"; \
-## TODO ## 		find $$lang $(html_files_find_predicates) | \
-## TODO ## 		while read file; do \
-## TODO ## 		  $(INSTALL_DATA) $$file $(DESTDIR)$(helpdir)/$$file || exit 66; \
-## TODO ## 		done \
-## TODO ## 	done
-## TODO ## 	@echo .
-## TODO ## 
-## TODO ## 	@echo "** Installing images: (G=gif, J=jpg, M=mng, P=png, X=xcf)"
-## TODO ## 
-## TODO ## 	@(cd $(top_srcdir) && find images $(image_find_predicates)) | \
-## TODO ## 	while read file; do \
-## TODO ## 		case "$$file" in \
-## TODO ## 		  *.png) $(echo_n) P ;; \
-## TODO ## 		  *.jpg) $(echo_n) J ;; \
-## TODO ## 		  *.xcf) $(echo_n) X ;; \
-## TODO ## 		  *.mng) $(echo_n) M ;; \
-## TODO ## 		  *.gif) $(echo_n) G ;; \
-## TODO ## 		esac; \
-## TODO ## 		test -d $(DESTDIR)$(helpdir)/$${file%/*} || \
-## TODO ## 		$(MKDIR_P) $(DESTDIR)$(helpdir)/$${file%/*}; \
-## TODO ## 		$(INSTALL) $(top_srcdir)/$$file $(DESTDIR)$(helpdir)/$$file || exit 66; \
-## TODO ## 	done
-## TODO ## 	@echo .
-## TODO ## 
-## TODO ## uninstall-local:
-## TODO ## 	rm -rf $(DESTDIR)$(helpdir)
-
 if HAVE_DOT
 ########################################################################
 ####            Build system development                            ####
diff --git a/configure.ac b/configure.ac
index 68b5b91..5983680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,7 @@ if test "x$with_gimp" != "xno"; then
 
   gimpdatadir=`$PKG_CONFIG --variable=gimpdatadir gimp-2.0`
 else
+  gimpdatadir=`pkg-config --variable=gimpdatadir gimp-2.0` ||
   gimpdatadir='$(datadir)/gimp/2.0'
 fi