Re: loader/Makefile is broken in 1.4rc1

Hi Mark,

On Sun, 2009-07-05 at 12:57 +0100, Mark Cave-Ayland wrote:
> > Why was it changed? Why do I have to install PostGIS under PostgreSQL
> > directory? I believe RPM/deb/whatever users will want to stick with FHS.

> There are two reasons for going with PGXS: firstly, different
> distributions have different directory structures for storing their
> files; so tying everything into PostgreSQL means once PostgreSQL works,
> everything else just works. Secondly, any changes in the PostgreSQL
> Makefiles are automatically picked up via PGXS which saves us having to
> maintain the whole set of randomly-hacked PostgreSQL Makefiles ourselves
> (including supporting new platforms as and when they occur).

I see, thanks.

> Now the issue here is that PGXS doesn't handle building front-end
> executables, and various experiments I tried to make this work failed
> miserably and so a non-PGXS version was devised. However, as you quite
> rightly point out, we need to know DESTDIR just in case we are building
> out of the tree...
>
> So please can you try the attached patch?

It worked. Package is built cleanly.

Thanks for the quick response.

Regards,
--
Devrim GÜNDÜZ, RHCE
Command Prompt - http://www.CommandPrompt.com 
devrim~gunduz.org, devrim~PostgreSQL.org, devrim.gunduz~linux.org.tr
                   http://www.gunduz.org

[postgis-loader-makefile.patch]

---

--- loader/Makefile.in.old 2009-07-06 00:10:47.000000000 +0300
+++ loader/Makefile.in 2009-07-06 00:12:35.000000000 +0300
@@ -23,9 +23,6 @@
 PGSQL_FE_CPPFLAGS=@PGSQL_FE_CPPFLAGS@
 PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@
 
-# PostgreSQL executable directory
-PGSQL_BINDIR=@PGSQL_BINDIR@
-
 # iconv flags
 ICONV_LDFLAGS=@ICONV_LDFLAGS@
 
@@ -36,6 +33,19 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 
+# PGXS information
+#
+# Note that PGXS currently doesn't handle building FE executables, but we need
+# the INSTALL and DESTDIR variables so we can get the correct install paths.
+# Hence we include the PGXS Makefile here, but ensure that we override the
+# 'all' and 'install' targets with the ones we really want to use below.
+PG_CONFIG = @PGCONFIG@
+PGXS := @PGXS@
+include $(PGXS)
+
+# The real parts of the Makefile
+
+
 all: $(SHP2PGSQL) $(PGSQL2SHP) @GTK_BUILD@
 
 gui: $(SHP2PGSQL-GUI) $(SHP2PGSQL-CLI)
@@ -67,12 +77,13 @@
  $(CC) $(CFLAGS) $(ICONV_LDFLAGS) -lm $^ -o $@
 
 install: all
- @cp $(PGSQL2SHP) $(PGSQL_BINDIR)/$(PGSQL2SHP)
- @cp $(SHP2PGSQL) $(PGSQL_BINDIR)/$(SHP2PGSQL)
+ @mkdir -p $(DESTDIR)$(bindir)
+ $(INSTALL) $(PGSQL2SHP) $(DESTDIR)$(bindir)
+ $(INSTALL) $(SHP2PGSQL) $(DESTDIR)$(bindir)
 
 uninstall:
- @rm -f $(PGSQL_BINDIR)/$(PGSQL2SHP)
- @rm -f $(PGSQL_BINDIR)/$(SHP2PGSQL)
+ @rm -f $(DESTDIR)$(bindir)/$(PGSQL2SHP)
+ @rm -f $(DESTDIR)$(bindir)/$(SHP2PGSQL)
 
 clean:
  @rm -f *.o $(SHP2PGSQL) $(PGSQL2SHP)

---

_______________________________________________
postgis-devel mailing list
postgis-devel@...
http://postgis.refractions.net/mailman/listinfo/postgis-devel