diff options
| -rw-r--r-- | openwrt/package/screen/Makefile | 82 | ||||
| -rw-r--r-- | openwrt/package/screen/ipkg/screen.control (renamed from openwrt/package/screen/screen.control) | 2 |
2 files changed, 33 insertions, 51 deletions
diff --git a/openwrt/package/screen/Makefile b/openwrt/package/screen/Makefile index fc82bd7071..575c99b783 100644 --- a/openwrt/package/screen/Makefile +++ b/openwrt/package/screen/Makefile @@ -12,67 +12,49 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -IPKG_SCREEN:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -IDIR_SCREEN:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) -INFO_SCREEN:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list +include $(TOPDIR)/package/rules.mk -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) - -$(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 - touch $(PKG_BUILD_DIR)/.prepared +$(eval $(call PKG_template,SCREEN,screen,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ./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_NLS) \ - $(DISABLE_LARGEFILE) \ + --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) \ + --enable-shared \ + --disable-static \ ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) + touch $(PKG_BUILD_DIR)/.built -$(IPKG_SCREEN): $(PKG_BUILD_DIR)/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_SCREEN) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(IDIR_SCREEN)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_SCREEN)/usr/sbin/ - $(STRIP) $(IDIR_SCREEN)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) +$(IPKG_SCREEN): + install -d -m0755 $(IDIR_SCREEN)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/screen $(IDIR_SCREEN)/usr/sbin/ + $(RSTRIP) $(IDIR_SCREEN) $(IPKG_BUILD) $(IDIR_SCREEN) $(PACKAGE_DIR) - -$(INFO_SCREEN): $(IPKG_SCREEN) - $(IPKG) install $(IPKG_SCREEN) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: $(IPKG_SCREEN) -install: $(INFO_SCREEN) - -clean: - rm -rf $(PKG_BUILD_DIR) $(IPKG_SCREEN) diff --git a/openwrt/package/screen/screen.control b/openwrt/package/screen/ipkg/screen.control index b1d5cb28c8..6ccfb96b06 100644 --- a/openwrt/package/screen/screen.control +++ b/openwrt/package/screen/ipkg/screen.control @@ -1,6 +1,6 @@ Package: screen Priority: optional -Section: net +Section: misc Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> Source: buildroot internal Depends: libncurses |