MySQL is now installed in STAGING_DIR/usr

[openwrt.git] / package / popt / Makefile

diff --git a/package/popt/Makefile b/package/popt/Makefile
index 264219d..5d67b80 100644 (file)
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -2,30 +2,33 @@
 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

-PKG_NAME := popt
-PKG_VERSION := 1.7
-PKG_RELEASE := 4
-PKG_MD5SUM := 5988e7aeb0ae4dac8d83561265984cc9
+PKG_NAME:=popt
+PKG_VERSION:=1.7
+PKG_RELEASE:=4
+PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9

 
 

-PKG_SOURCE_URL := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \
+PKG_SOURCE_URL:=\
+       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \

        http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
        http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/

-PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT := zcat
-PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+IPKG_LIBPOPT:=$(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+IDIR_LIBPOPT:=$(PKG_BUILD_DIR)/ipkg/lib$(PKG_NAME)
+INFO_LIBPOPT:=$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list

 
 $(DL_DIR)/$(PKG_SOURCE):
 
 $(DL_DIR)/$(PKG_SOURCE):

-       mkdir -p $(DL_DIR)

        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 

-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)

        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 #      $(PATCH) $(PKG_BUILD_DIR) ./patches
        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 #      $(PATCH) $(PKG_BUILD_DIR) ./patches

-       touch $(PKG_BUILD_DIR)/.patched
+       touch $(PKG_BUILD_DIR)/.prepared

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+       (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \


@@ -56,35 +59,33 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
        touch $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        touch $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured

-       $(MAKE) -C "$(PKG_BUILD_DIR)"
+       $(MAKE) -C $(PKG_BUILD_DIR)

        touch $(PKG_BUILD_DIR)/.built
 
 $(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built
        touch $(PKG_BUILD_DIR)/.built
 
 $(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built

-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
+       $(MAKE) -C $(PKG_BUILD_DIR) \

                DESTDIR="$(STAGING_DIR)" \
                install
        rm -f $(STAGING_DIR)/usr/lib/libpopt.la
 
                DESTDIR="$(STAGING_DIR)" \
                install
        rm -f $(STAGING_DIR)/usr/lib/libpopt.la
 

-$(PKG_IPK): $(STAGING_DIR)/usr/lib/libpopt.so
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) libpopt.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_IPK_DIR)/usr/lib
-       cp -fp $(STAGING_DIR)/usr/lib/libpopt.so.* $(PKG_IPK_DIR)/usr/lib/
-       $(STRIP) $(PKG_IPK_DIR)/usr/lib/*.so*
+$(IPKG_LIBPOPT): $(STAGING_DIR)/usr/lib/libpopt.so
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPOPT) lib$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       mkdir -p $(IDIR_LIBPOPT)/usr/lib
+       cp -fp $(STAGING_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/
+       $(STRIP) $(IDIR_LIBPOPT)/usr/lib/*.so*

        mkdir -p $(PACKAGE_DIR)
        mkdir -p $(PACKAGE_DIR)

-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+       $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR)

 
 

-$(IPKG_STATE_DIR)/info/libpopt.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
+$(INFO_LIBPOPT): $(IPKG_LIBPOPT)
+       $(IPKG) install $(IPKG_LIBPOPT)

 
 source: $(DL_DIR)/$(PKG_SOURCE)
 
 source: $(DL_DIR)/$(PKG_SOURCE)

-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/libpopt.list
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: $(IPKG_LIBPOPT)
+install: $(INFO_LIBPOPT)

 
 clean:
 
 clean:

-       -$(MAKE) -C "$(PKG_BUILD_DIR)" \
+       -$(MAKE) -C $(PKG_BUILD_DIR) \

                DESTDIR="$(STAGING_DIR)" \
                uninstall
                DESTDIR="$(STAGING_DIR)" \
                uninstall

-       rm -rf \
-               $(PKG_BUILD_DIR) \
-               $(PKG_IPK) \
+       rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPOPT)