summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/nocatsplash/Makefile98
-rw-r--r--package/nocatsplash/ipkg/nocatsplash.conffiles1
-rw-r--r--package/nocatsplash/ipkg/nocatsplash.control (renamed from package/nocatsplash/nocatsplash.control)0
3 files changed, 41 insertions, 58 deletions
diff --git a/package/nocatsplash/Makefile b/package/nocatsplash/Makefile
index 95e83c1f79..b869a63f6a 100644
--- a/package/nocatsplash/Makefile
+++ b/package/nocatsplash/Makefile
@@ -9,73 +9,55 @@ PKG_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81
PKG_SOURCE_URL:=http://wifi.rulez.org/~josephus/
PKG_SOURCE:=NoCatSplash-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/NoCatSplash-$(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) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+PKG_BUILD_DIR:=$(BUILD_DIR)/NoCatSplash-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
-$(PKG_BUILD_DIR)/.patched: $(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)/.patched
+$(eval $(call PKG_template,NOCATSPLASH,nocatsplash,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
- (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured:
+ (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) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(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) \
+ --with-glib-prefix="$(STAGING_DIR)/usr" \
+ )
touch $(PKG_BUILD_DIR)/.configured
-GLIB_CFLAGS :=-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
-
-$(PKG_BUILD_DIR)/src/splashd: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
+ mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
- CC=$(TARGET_CC) \
- GLIB_CFLAGS="$(GLIB_CFLAGS)" \
- AM_CFLAGS="$(TARGET_CFLAGS) $(GLIB_CFLAGS)" \
- GLIB_LIBS="-L$(STAGING_DIR)/usr/lib -lglib" \
- LIBS="-L$(STAGING_DIR)/usr/lib -lglib"
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/src/splashd
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CC=$(TARGET_CC) \
- GLIB_CFLAGS="$(GLIB_CFLAGS)" \
- AM_CFLAGS="$(TARGET_CFLAGS) $(GLIB_CFLAGS)" \
- GLIB_LIBS="-L$(STAGING_DIR)/usr/lib -lglib" \
- LIBS="-L$(STAGING_DIR)/usr/lib -lglib" \
- DESTDIR=$(PKG_IPK_DIR) install
- $(STRIP) $(PKG_IPK_DIR)/usr/sbin/splashd
- mkdir -p $(PACKAGE_DIR)
- $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
- $(IPKG) install $(PKG_IPK)
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all install
+ touch $(PKG_BUILD_DIR)/.built
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+$(IPKG_NOCATSPLASH):
+ mkdir -p $(IDIR_NOCATSPLASH)
+ cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_NOCATSPLASH)/
+ $(RSTRIP) $(IDIR_NOCATSPLASH)
+ $(IPKG_BUILD) $(IDIR_NOCATSPLASH) $(PACKAGE_DIR)
-clean:
- rm -rf $(PKG_BUILD_DIR)
- rm -f $(PKG_IPK)
diff --git a/package/nocatsplash/ipkg/nocatsplash.conffiles b/package/nocatsplash/ipkg/nocatsplash.conffiles
new file mode 100644
index 0000000000..a25777d9a4
--- /dev/null
+++ b/package/nocatsplash/ipkg/nocatsplash.conffiles
@@ -0,0 +1 @@
+/etc/nocat.conf
diff --git a/package/nocatsplash/nocatsplash.control b/package/nocatsplash/ipkg/nocatsplash.control
index 747d330ffd..747d330ffd 100644
--- a/package/nocatsplash/nocatsplash.control
+++ b/package/nocatsplash/ipkg/nocatsplash.control