Re: [PATCH] Appbundle-Support for 1.2 - Mailing list pgadmin-hackers

Dave Page wrote:
>
>
>
>>-----Original Message-----
>>From: blacknoz@club-internet.fr [mailto:blacknoz@club-internet.fr]
>>Sent: 13 May 2005 16:49
>>To: Dave Page; fgp@phlo.org; pgadmin-hackers@postgresql.org
>>Subject: Re: Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2
>>
>>Hi Dave, Florian,
>>
>>----Message d'origine----
>>
>>>Sujet: Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2
>>>Date: Fri, 13 May 2005 12:55:32 +0100
>>>De: "Dave Page" <dpage@vale-housing.co.uk>
>>>A: "Florian G. Pflug" <fgp@phlo.org>,
>>>
>>>Thanks Florian - patch applied.
>>>
>>>Can you test and confirm the committed version works OK please? I'll
>>>probably need you to do so again following any changes that
>>
>>Raph submits
>>
>>>for Debian if that's OK.
>>
>>I just took a quick look to the patch provided by Florian. I
>>didn't try the build yet and I may be wrong, but to me it
>>does not handle the "DESTDIR" problem and refers to PREFIX,
>>not DESTDIR.
>>However, I'll try that tonight. Florian, can you confirm you
>>were referring to DESTDIR and not PREFIX ?
>>Is there some magic that make PREFIX take DESTDIR as a parameter ?
>>
>
>
> Gmake/automake/autoconf is all black magic for me, hence why I'd rather
> tackle one problem on on OS (that I don't have) at a time :-)

So, let's continue the twist :)

attached is the patch that works for me and keeps what was added by
Florian. As I understand it, $(PREFIX) is the equivalent to "my"
$(DESTDIR). Is it specific to Mac OS X ? If not and if it can be
replaced by DESTDIR, I'd suggest removing "$(PREFIX)" ref from Makefile.am.

Florian, what do you think about it?

Regards,
Raphaël
Index: i18n/Makefile.am
===================================================================
--- i18n/Makefile.am    (revision 4182)
+++ i18n/Makefile.am    (working copy)
@@ -33,13 +33,13 @@
 endif

 install-data-local:
-    $(mkinstalldirs) $(PREFIX)$(i18ndir)
+    $(mkinstalldirs) $(DESTDIR)$(PREFIX)$(i18ndir)
     @pub_tx='$(PUB_TX)'; \
     for DIR in $$pub_tx; do \
-        $(mkinstalldirs) $(PREFIX)$(i18ndir)/$$DIR; \
+        $(mkinstalldirs) $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR; \
         for FILE in `ls $$DIR/*.mo`; do \
-            $(install_sh) -c -m 644 $$FILE $(PREFIX)$(i18ndir)/$$DIR/; \
+            $(install_sh) -c -m 644 $$FILE $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR/; \
         done \
     done
-    $(install_sh) -c -m 644 pgadmin3.lng $(PREFIX)$(i18ndir)/$$DIR
-    $(install_sh) -c -m 644 wxstd.mo $(PREFIX)$(i18ndir)/$$DIR
+    $(install_sh) -c -m 644 pgadmin3.lng $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR
+    $(install_sh) -c -m 644 wxstd.mo $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR