Thread: i18n Makefile for 1.3.0 does not handle DESTDIR correctly

i18n Makefile for 1.3.0 does not handle DESTDIR correctly

From
Raphaël Enrici
Date:
Hi Dave,

the Makefile in i18n pgadmin3 directory does not handle properly DESTDIR
 and tries to install files directly in the prefix.

Example of failed session:
...
/usr/bin/make install DESTDIR=/home/pga3/1.3.0/pgadmin3-1.3.0/debian/tmp
make[1]: Entering directory `/home/pga3/1.3.0/pgadmin3-1.3.0'
Making install in i18n
make[2]: Entering directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
make[3]: Entering directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
make[3]: Nothing to be done for `install-exec-am'.
/home/pga3/1.3.0/pgadmin3-1.3.0/config/install-sh -d
/usr/share/pgadmin3/i18n
mkdir: cannot create directory `/usr/share/pgadmin3': Permission denied
make[3]: *** [install-data-local] Error 1
make[3]: Leaving directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
make[2]: *** [install-am] Error 2
make[2]: Leaving directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
make[1]: *** [install-recursive] Error 1
make[1]: Leaving directory `/home/pga3/1.3.0/pgadmin3-1.3.0'
make: *** [install] Error 2

Would this be possible to correct this please ? The patch attached
should do the trick although not well tested.

Regards,
Raphaël

--- i18n/Makefile.am.orig    2005-05-12 23:41:32.963505120 +0200
+++ i18n/Makefile.am    2005-05-12 23:42:16.878828976 +0200
@@ -30,14 +30,14 @@


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




Attachment

Re: i18n Makefile for 1.3.0 does not handle DESTDIR correctly

From
"Dave Page"
Date:
Hi Raphaël

Florian has submitted a bigger patch that looks like it should sort this as well so I'll apply that one.

Thanks anyway :-)

Regards, Dave.

> -----Original Message-----
> From: Raphaël Enrici [mailto:blacknoz@club-internet.fr]
> Sent: 12 May 2005 23:09
> To: Dave Page; PgAdmin Hackers
> Subject: i18n Makefile for 1.3.0 does not handle DESTDIR correctly
>
> Hi Dave,
>
> the Makefile in i18n pgadmin3 directory does not handle
> properly DESTDIR
>  and tries to install files directly in the prefix.
>
> Example of failed session:
> ...
> /usr/bin/make install
> DESTDIR=/home/pga3/1.3.0/pgadmin3-1.3.0/debian/tmp
> make[1]: Entering directory `/home/pga3/1.3.0/pgadmin3-1.3.0'
> Making install in i18n
> make[2]: Entering directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
> make[3]: Entering directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
> make[3]: Nothing to be done for `install-exec-am'.
> /home/pga3/1.3.0/pgadmin3-1.3.0/config/install-sh -d
> /usr/share/pgadmin3/i18n
> mkdir: cannot create directory `/usr/share/pgadmin3':
> Permission denied
> make[3]: *** [install-data-local] Error 1
> make[3]: Leaving directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
> make[2]: *** [install-am] Error 2
> make[2]: Leaving directory `/home/pga3/1.3.0/pgadmin3-1.3.0/i18n'
> make[1]: *** [install-recursive] Error 1
> make[1]: Leaving directory `/home/pga3/1.3.0/pgadmin3-1.3.0'
> make: *** [install] Error 2
>
> Would this be possible to correct this please ? The patch attached
> should do the trick although not well tested.
>
> Regards,
> Raphaël
>
>