Allow separate build and source trees

From: Bernard Leak <bernard@brenda-arkle.demon.co.uk>

Allow separate build and source trees.

diff --git a/alsaconf/Makefile.am b/alsaconf/Makefile.am
index c295fdd3aa361a9502496fb41ef679d170e59b55..a11ecc57f9c4df15517b897905ee4c798a08a62f 100644 (file)
--- a/alsaconf/Makefile.am
+++ b/alsaconf/Makefile.am
@@ -17,7 +17,7 @@ install-man8:
          esac; \
          $(mkinstalldirs) $(DESTDIR)$(mandir)$$loc/man$$ext; \
          echo " $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext"; \
-         $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
+         $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
        done
 
 uninstall-man8:

diff --git a/alsaconf/po/Makefile.in b/alsaconf/po/Makefile.in
index 349a00b292e4a210eaae636ab595c66dbbb45ba8..f1fa9aa61ad380cd93fceb563c22ab0c66eada2e 100644 (file)
--- a/alsaconf/po/Makefile.in
+++ b/alsaconf/po/Makefile.in
@@ -7,6 +7,7 @@ XGETTEXT_OPTIONS = -kxmsg -kxecho
 
 top_builddir = ../..
 
+srcdir = @srcdir@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 prefix = @prefix@
@@ -33,24 +34,26 @@ all-no:
 
 .SUFFIXES: .po .gmo .mo
 
-.po.mo:
+%.mo : $(srcdir)/%.po
        $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
-.po.gmo:
-       @lang=`echo $* | sed -e 's,.*/,,'`; \
-       rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+%.gmo : $(srcdir)/%.po
+       @lang=`echo $(srcdir)/$* | sed -e 's,.*/,,'`; \
+       rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
 $(DOMAIN).pot: $(GETTEXT_SRC)
        $(XGETTEXT) -o$@ --default-domain=$(DOMAIN) \
          --add-comments=TRANSLATORS: --language=Shell \
          $(XGETTEXT_OPTIONS) $<
 
+check check_recursive:
+
 clean:
        rm -f $(CATALOGS) $(POFILES:.po=.mo) $(DOMAIN).pot
 
 update-po: $(DOMAIN).pot
        @for po in $(POFILES); do \
-       $(MSGMERGE_UPDATE) $$po $(DOMAIN).pot; \
+       $(MSGMERGE_UPDATE) $(srcdir)/$$po $(DOMAIN).pot; \
        done
 
 install-data-no: