X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0d52ac0f6a06a36bc0f0316b8593f1f8dc3a8a53..2e1c8a5f24fcb007f3cbc1508d1dd7aff6a83b44:/package/pptpd/Makefile?ds=sidebyside

diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 5714e4d78..a115bd511 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -1,73 +1,69 @@
-#############################################################
-#
-# ebtables
-#
-#############################################################
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd
 PKG_VERSION:=1.2.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
+PKG_MD5SUM:=a521e40ca304b0c125cc25f9b9d03324
+
 PKG_SOURCE_URL:=@SF/poptop
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
-
-$(DL_DIR)/$(PKG_SOURCE):
-	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL)
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(PKG_BUILD_DIR)/.unpacked
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
-	(cd $(PKG_BUILD_DIR) ; \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	./configure \
-	  --target=$(GNU_TARGET_NAME) \
-	  --host=$(GNU_TARGET_NAME) \
-	  --build=$(GNU_HOST_NAME) \
-	  --prefix=/usr \
-	  --exec-prefix=/usr \
-	  --bindir=/usr/bin \
-	  --sbindir=/usr/sbin \
-	  --libexecdir=/usr/lib \
-	  --datadir=/usr/share \
-	  --infodir=/usr/share/info \
-	  --mandir=/usr/share/man \
-	  --localstatedir=/var \
-	  --sysconfdir=/etc \
-	  $(DISABLE_NLS) \
-	  --with-pppd-ip-alloc)
-	touch $(PKG_BUILD_DIR)/.configured
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	 CC=$(TARGET_CC) \
-	 CFLAGS="$(TARGET_CFLAGS) -DSBINDIR=\\\"/usr/sbin\\\"" \
-	 all
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
-	mkdir -p $(PKG_IPK_DIR)/usr/sbin
-	cp -a ./ipkg/* $(PKG_IPK_DIR)/
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	cp $(PKG_BUILD_DIR)/pptpd $(PKG_IPK_DIR)/usr/sbin/
-	cp $(PKG_BUILD_DIR)/pptpctrl $(PKG_IPK_DIR)/usr/sbin/
-	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+$(eval $(call PKG_template,PPTPD,pptpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(IPKG_STATE_DIR)/info/pptpd.list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
+$(PKG_BUILD_DIR)/.configured:
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		./configure \
+		  --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_LARGEFILE) \
+		  $(DISABLE_NLS) \
+		  --with-pppd-ip-alloc \
+	)
+	touch $@
 
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/pptpd.list
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) \
+		CFLAGS="$(TARGET_CFLAGS) -DSBINDIR=\\\"/usr/sbin\\\"" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		INSTALL="install" \
+		all install
+	touch $@
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+$(IPKG_PPTPD):
+	install -d -m0755 $(IDIR_PPTPD)/etc
+	install -m0644 ./files/pptpd.conf $(IDIR_PPTPD)/etc/
+	install -d -m0755 $(IDIR_PPTPD)/etc/init.d
+	install -m0755 ./files/pptpd.init $(IDIR_PPTPD)/etc/init.d/pptpd
+	install -d -m0755 $(IDIR_PPTPD)/etc/ppp
+	install -m0644 ./files/options.pptpd $(IDIR_PPTPD)/etc/ppp/
+	install -d -m0755 $(IDIR_PPTPD)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(IDIR_PPTPD)/usr/sbin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(IDIR_PPTPD)/usr/sbin/
+	$(RSTRIP) $(IDIR_PPTPD)
+	$(IPKG_BUILD) $(IDIR_PPTPD) $(PACKAGE_DIR)