Changeset d2789da in freewrt

Timestamp:

Sep 16, 2006, 9:38:26 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

cb40a561

Parents:

0a8a392

Message:

fix some glitches from commit #600

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@612 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/pkg-depend.mk (modified) (1 diff)
• package/asterisk/Makefile (modified) (3 diffs)
• package/ipset/Makefile (modified) (1 diff)
• package/libnet/Makefile (modified) (1 diff)
• package/mysql/Makefile (modified) (1 diff)

mk/pkg-depend.mk

@@ -153 +153 @@
 endif
 
-hostapd-compile: wireless-tools-compile
+hostapd-compile: wireless-tools-compile madwifi-compile
 ifneq ($(FWRT_PACKAGE_HOSTAPD),)
 hostapd-compile: openssl-compile

package/asterisk/Makefile

@@ -11 +11 @@
 PKG_RELEASE:=           1
 PKG_MD5SUM:=            04657086791e80f319c0d728af705001
+PKG_INIT:=              60
 
 PKG_SOURCE_URL:=        http://ftp.digium.com/pub/asterisk/old-releases/ \
@@ -126 +127 @@
         install -m0644 ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
         $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
-        install -d -m0755 $(IDIR_ASTERISK)/etc/default
-        install -m0644  ./files/asterisk.default $(IDIR_ASTERISK)/etc/default/asterisk
         install -d -m0755 $(IDIR_ASTERISK)/etc/init.d
-        install -m0755  ./files/asterisk.init $(IDIR_ASTERISK)/etc/init.d/asterisk
-        ln -sf asterisk $(IDIR_ASTERISK)/etc/init.d/S60asterisk
+        install -m0755  ./files/asterisk.init $(IDIR_ASTERISK)/etc/init.d/S$(PKG_INIT)asterisk
         $(RSTRIP) $(IDIR_ASTERISK)
         $(IPKG_BUILD) $(IDIR_ASTERISK) $(PACKAGE_DIR)
@@ -154 +152 @@
         $(CP) $(WRKINST)/usr/sbin/asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/
         $(CP) $(WRKINST)/usr/sbin/safe_asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/default
-        install -m0644  ./files/asterisk.default $(IDIR_ASTERISK_MINI)/etc/default/asterisk
         install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/init.d
-        install -m0755  ./files/asterisk.init $(IDIR_ASTERISK_MINI)/etc/init.d/asterisk
-        ln -sf asterisk $(IDIR_ASTERISK_MINI)/etc/init.d/S60asterisk
+        install -m0755  ./files/asterisk.init $(IDIR_ASTERISK_MINI)/etc/init.d/S$(PKG_INIT)asterisk
         $(RSTRIP) $(IDIR_ASTERISK_MINI)
         $(IPKG_BUILD) $(IDIR_ASTERISK_MINI) $(PACKAGE_DIR)

package/ipset/Makefile

@@ -35 +35 @@
                 DESTDIR=$(IDIR_IPSET) PREFIX=/usr install
         rm -rf $(IDIR_IPSET)/usr/man
-i       $(RSTRIP) $(IDIR_IPSET)
+        $(RSTRIP) $(IDIR_IPSET)
         $(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR)

package/libnet/Makefile

@@ -17 +17 @@
 WRKSRC=                 ${WRKDIR}/Libnet-$(PKG_VERSION)
 
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/mk/package.mk
 
 ENDIAN:=lil

package/mysql/Makefile

@@ -111 +111 @@
 $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(WRKBUILD)/.built
         $(INSTALL_DIR) $(STAGING_DIR)/usr/bin
-        $(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-        $(INSTALL_DIR) $(STAGING_DIR)/usr/include
+        $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/mysql
+        $(INSTALL_DIR) $(STAGING_DIR)/usr/include/mysql
         $(INSTALL_DATA) $(WRKINST)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/
-        $(INSTALL_DATA) $(WRKINST)/usr/include/mysql $(STAGING_DIR)/usr/include/
-        $(INSTALL_DATA) $(WRKINST)/usr/lib/mysql $(STAGING_DIR)/usr/lib/
+        $(INSTALL_DATA) $(WRKINST)/usr/include/mysql/* $(STAGING_DIR)/usr/include/mysql
+        $(INSTALL_DATA) $(WRKINST)/usr/lib/mysql/* $(STAGING_DIR)/usr/lib/mysql
         rm -f $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la
         touch $@