fix typos, sort template calls

[openwrt.git] / package / postgresql / Makefile

diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index de021ba..85fcabe 100644 (file)
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -23,8 +23,8 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,LIBPQ,libpq,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PGSQL_CLI,pgsql-cli,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call PKG_template,LIBPQ,libpq,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PGSQL_CLI,pgsql-cli,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured:

 #      ./configure advertise "--infodir", but does not support it, replaced with "--docdir"
 #      ./configure advertise "--infodir", but does not support it, replaced with "--docdir"

+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \


@@ -76,6 +76,11 @@ $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C "$(PKG_BUILD_DIR)/src/interfaces/libpq" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        $(MAKE) -C "$(PKG_BUILD_DIR)/src/interfaces/libpq" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install

+       $(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/pg_config" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               includedir="$(STAGING_DIR)/usr/include" \
+               libdir="$(STAGING_DIR)/usr/lib" \
+               all install

        $(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/psql" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        $(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/psql" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install


@@ -94,8 +99,12 @@ $(IPKG_PGSQL_CLI):
        $(IPKG_BUILD) $(IDIR_PGSQL_CLI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
        $(IPKG_BUILD) $(IDIR_PGSQL_CLI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built

+       mkdir -p $(STAGING_DIR)/usr/bin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/

        mkdir -p $(STAGING_DIR)/usr/include
        mkdir -p $(STAGING_DIR)/usr/include

+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/

        cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/

+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/

        cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib


@@ -106,10 +115,13 @@ install-dev: $(STAGING_DIR)/usr/lib/libpq.so
 
 uninstall-dev:
        rm -rf \
 
 uninstall-dev:
        rm -rf \

+               $(STAGING_DIR)/usr/bin/pg_config \
+               $(STAGING_DIR)/usr/include/libpq \

                $(STAGING_DIR)/usr/include/libpq-fe.h \
                $(STAGING_DIR)/usr/include/libpq-fe.h \

+               $(STAGING_DIR)/usr/include/pg_config.h \

                $(STAGING_DIR)/usr/include/postgres_ext.h \
                $(STAGING_DIR)/usr/include/postgresql \
                $(STAGING_DIR)/usr/lib/libpq.{a,so*} \
 
                $(STAGING_DIR)/usr/include/postgres_ext.h \
                $(STAGING_DIR)/usr/include/postgresql \
                $(STAGING_DIR)/usr/lib/libpq.{a,so*} \
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev