Fix out-of-tree builds [Vladimir Koković]

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@8118 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/branding/Makefile.am b/branding/Makefile.am
index bde0b5df892395da41b628a7bb7f0d41c71e0fcb..b61ba81869ee03c6b5371cb8293f174fb52a6fbb 100644 (file)
--- a/branding/Makefile.am
+++ b/branding/Makefile.am
@@ -20,4 +20,4 @@ endif
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(brandingdir)
-       $(install_sh) -c -m 644 branding.ini $(DESTDIR)$(brandingdir)
+       $(install_sh) -c -m 644 $(EXTRA_DIST) $(DESTDIR)$(brandingdir)

diff --git a/i18n/Makefile.am b/i18n/Makefile.am
index 881b1809b5f4cd2f31fd3c4164ba810ad4470cfa..06d6bf5046b00ff22cfb009ea40dd6d53975b1fe 100644 (file)
--- a/i18n/Makefile.am
+++ b/i18n/Makefile.am
@@ -36,13 +36,13 @@ install-data-local:
        @pub_tx='$(PUB_TX)'; \
        for DIR in $$pub_tx; do \
                $(mkinstalldirs) $(DESTDIR)$(i18ndir)/$$DIR; \
-               for FILE in `ls $$DIR/*.mo`; do \
+               for FILE in `ls $(srcdir)/$$DIR/*.mo`; do \
                        $(install_sh) -c -m 644 $$FILE $(DESTDIR)$(i18ndir)/$$DIR/; \
                done \
        done
-       $(install_sh) -c -m 644 pgadmin3.lng $(DESTDIR)$(i18ndir)/$$DIR
-       $(install_sh) -c -m 644 pg_settings.csv $(DESTDIR)$(i18ndir)/$$DIR
-       $(install_sh) -c -m 644 wxstd.mo $(DESTDIR)$(i18ndir)/$$DIR
+       $(install_sh) -c -m 644 $(srcdir)/pgadmin3.lng $(DESTDIR)$(i18ndir)/$$DIR
+       $(install_sh) -c -m 644 $(srcdir)/pg_settings.csv $(DESTDIR)$(i18ndir)/$$DIR
+       $(install_sh) -c -m 644 $(srcdir)/wxstd.mo $(DESTDIR)$(i18ndir)/$$DIR
 
 # Remove the wildcard directory that automake will have added for us
 dist-hook: