X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=openwrt%2Fpackage%2Fwx200d%2FMakefile;h=7eb3a4054ff9fb9646a37d42f0fa7964f0520bd5;hp=a0eec3aacc6b24f34e4e763e8ca1da4e1f5dd5a0;hb=708dd97edc96d1335e9647de6cf4eebef60a30ec;hpb=42a48dc68cf40b59f12b3f6257b3ef9286029ead

diff --git a/openwrt/package/wx200d/Makefile b/openwrt/package/wx200d/Makefile
index a0eec3aacc..7eb3a4054f 100644
--- a/openwrt/package/wx200d/Makefile
+++ b/openwrt/package/wx200d/Makefile
@@ -6,11 +6,14 @@ PKG_NAME:=wx200d
 PKG_VERSION:=1.3
 PKG_RELEASE:=1
 PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c
+
 PKG_SOURCE_URL:=@SF/wx200d
 PKG_SOURCE:=wx200d-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,WX200D,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -25,27 +28,43 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 			--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
 			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
 			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_NLS) \
+			$(DISABLE_LARGEFILE) \
 			--without-libiconv-prefix \
 			--without-libintl-prefix \
-			--disable-nls \
 	);
 	touch $@
 
 $(PKG_BUILD_DIR)/.built: 
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
-		CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ"
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 	touch $@
 
 $(IPKG_WX200D):
 	install -d -m0755 $(IDIR_WX200D)/usr/bin
-	install -m0644 $(PKG_BUILD_DIR)/wx200 \
-		$(PKG_BUILD_DIR)/wxstdout \
-		$(PKG_BUILD_DIR)/wxfilter \
-		$(PKG_BUILD_DIR)/wxdebug $(IDIR_WX200D)/usr/bin/
-	mkdir -p $(IDIR_WX200D)/usr/sbin/
-	install -m0644 $(PKG_BUILD_DIR)/wx200d \
-		$(PKG_BUILD_DIR)/wxread $(IDIR_WX200D)/usr/sbin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/wx200 \
+		$(PKG_INSTALL_DIR)/usr/bin/wxstdout \
+		$(PKG_INSTALL_DIR)/usr/bin/wxfilter \
+		$(PKG_INSTALL_DIR)/usr/bin/wxdebug $(IDIR_WX200D)/usr/bin/
+	install -d -m0755 $(IDIR_WX200D)/usr/sbin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wx200d \
+		$(PKG_INSTALL_DIR)/usr/sbin/wxread $(IDIR_WX200D)/usr/sbin/
 	$(RSTRIP) $(IDIR_WX200D)
 	$(IPKG_BUILD) $(IDIR_WX200D) $(PACKAGE_DIR)