Fix pmacct and friends compilation

[openwrt/svn-archive/archive.git] / net / pmacct / Makefile

diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile
index 57509cbe0a1f5fe7ddccf1148e2dba3474e2a865..a619bafa5a84d5d942959aef39775cf1e1c65141 100644 (file)
--- a/net/pmacct/Makefile
+++ b/net/pmacct/Makefile
@@ -114,9 +114,9 @@ $(PKG_BUILD_DIR)/nfacctd-$(1) $(PKG_BUILD_DIR)/pmacctd-$(1): $(PKG_BUILD_DIR)/.c
        $(call Build/Configure/Default, \
                --with-pcap-includes="$(STAGING_DIR)/usr/include" \
                --with-pcap-libs="$(STAGING_DIR)/usr/lib" \
-               $(2) \
-               , \
-               LIBS="-lz" \
+               "$(2)" \
+               ,\
+               LIBS+="-lz" \
        );
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@@ -137,14 +137,14 @@ define Package/$(1)/conffiles
 endef
 
 define Package/$(1)/install
-       install -d -m0755 $$(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/$(2) $$(1)/usr/sbin/$(3)
-       install -d -m0755 $$(1)/etc
-       install -m0644 ./files/$(3).conf $$(1)/etc/
-       install -d -m0755 $$(1)/etc/default
-       install -m0644 ./files/$(3).default $$(1)/etc/default/$(3)
-       install -d -m0755 $$(1)/etc/init.d
-       install -m0755 ./files/$(3).init $$(1)/etc/init.d/$(3)
+       $(INSTALL_DIR) $$(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(2) $$(1)/usr/sbin/$(3)
+       $(INSTALL_DIR) $$(1)/etc
+       $(INSTALL_DATA) ./files/$(3).conf $$(1)/etc/
+       $(INSTALL_DIR) $$(1)/etc/default
+       $(INSTALL_DATA) ./files/$(3).default $$(1)/etc/default/$(3)
+       $(INSTALL_DIR) $$(1)/etc/init.d
+       $(INSTALL_BIN) ./files/$(3).init $$(1)/etc/init.d/$(3)
 endef
 
 endef
@@ -160,8 +160,6 @@ ifneq ($(CONFIG_PACKAGE_nfacctd-mysql)$(CONFIG_PACKAGE_pmacctd-mysql),)
                --enable-mysql \
                --with-mysql-includes="$(STAGING_DIR)/usr/include" \
                --with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \
-               , \
-               LIBS='-lz' \
   ))
   $(eval $(call Install/Template,nfacctd-mysql,nfacctd-mysql,nfacctd))
   $(eval $(call Install/Template,pmacctd-mysql,pmacctd-mysql,pmacctd))
@@ -192,7 +190,7 @@ define Build/Compile
 endef
 
 define Package/pmacct-client/install
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/
 endef