Dave,
attached is the patch which both Florian and I think it solves the
DESTDIR issue in Makefile.am.
Regards,
Raphaël
Florian G. Pflug wrote:
> Raphaël Enrici wrote:
>
>>Dave Page wrote:
>>
>>>>From: blacknoz@club-internet.fr [mailto:blacknoz@club-internet.fr]
>>>>
>>>>Hi Dave, Florian,
>>>>
>>>>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?
>
>
> Dave, please apply Rapahels correction of my patch - I was just being
> brain-dead ;-)
>
> I meant to write "$(DESTDIR)" - but somehow I ended up typing
> "$(PREFIX)", and didn't notice because $(PREFIX) is undefined,
> and this empty.
>
> Sorry for the confusion
>
> greetings, Florian Pflug
>
> ---------------------------(end of broadcast)---------------------------
> TIP 6: Have you searched our list archives?
>
> http://archives.postgresql.org
>
--
Raphaël Enrici blacknoz@club-internet.fr
-- ICQ: 207246758 / Jabber: blacknoz@jabber.org --
-- Use Debian GNU/Linux http://www.debian.org/ --
-- Use pgAdmin http://www.pgadmin.org/ --
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)$(i18ndir)
@pub_tx='$(PUB_TX)'; \
for DIR in $$pub_tx; do \
- $(mkinstalldirs) $(PREFIX)$(i18ndir)/$$DIR; \
+ $(mkinstalldirs) $(DESTDIR)$(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)$(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)$(i18ndir)/$$DIR
+ $(install_sh) -c -m 644 wxstd.mo $(DESTDIR)$(i18ndir)/$$DIR
