projects
/
oweals
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f6ad530
)
Standardize package build (isn't it easier ?)
author
Nicolas Thill
<nico@openwrt.org>
Thu, 19 May 2005 22:52:12 +0000
(22:52 +0000)
committer
Nicolas Thill
<nico@openwrt.org>
Thu, 19 May 2005 22:52:12 +0000
(22:52 +0000)
SVN-Revision: 981
openwrt/package/olsrd/Makefile
patch
|
blob
|
history
diff --git
a/openwrt/package/olsrd/Makefile
b/openwrt/package/olsrd/Makefile
index 435c6a27d873c66db953cccd4f8df838fe820bde..ffd4b61431cae9886220baf159308715834dab4f 100644
(file)
--- a/
openwrt/package/olsrd/Makefile
+++ b/
openwrt/package/olsrd/Makefile
@@
-12,6
+12,7
@@
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(TOPDIR)/package/rules.mk
include $(TOPDIR)/package/rules.mk
@@
-19,7
+20,7
@@
define PKG_mod_template
$$(IPKG_$(1)):
install -d -m0755 $$(IDIR_$(1))/usr/lib
$$(IPKG_$(1)):
install -d -m0755 $$(IDIR_$(1))/usr/lib
- install -m0755 $(PKG_
BUILD_DIR)/lib/$(2)*
/olsrd_$(2).so.* $$(IDIR_$(1))/usr/lib/
+ install -m0755 $(PKG_
INSTALL_DIR)/usr/lib
/olsrd_$(2).so.* $$(IDIR_$(1))/usr/lib/
$(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
$(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
@@
-41,26
+42,26
@@
$(eval $(call PKG_mod_template,OLSRD_MOD_POWER,power))
$(eval $(call PKG_mod_template,OLSRD_MOD_SECURE,secure))
$(PKG_BUILD_DIR)/.configured:
$(eval $(call PKG_mod_template,OLSRD_MOD_SECURE,secure))
$(PKG_BUILD_DIR)/.configured:
- touch $
(PKG_BUILD_DIR)/.configured
+ touch $
@
$(PKG_BUILD_DIR)/.built:
$(PKG_BUILD_DIR)/.built:
+ rm -rf $(PKG_INSTALL_DIR)
+ mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C "$(PKG_BUILD_DIR)" \
$(MAKE) -C "$(PKG_BUILD_DIR)" \
+ $(TARGET_CONFIGURE_OPTS) \
+ NODEBUG=1 \
+ OFLAGS="$(TARGET_CFLAGS)" \
OS="linux" \
OS="linux" \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS) -DOLSR_PLUGIN -I. -Isrc -Dlinux -I../../src -DNODEBUG" \
- libs
- $(MAKE) -C "$(PKG_BUILD_DIR)" \
- OS="linux" \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS) -I. -Isrc -Dlinux -I../../src -DNODEBUG" \
- all
- touch $(PKG_BUILD_DIR)/.built
+ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+ STRIP="/bin/true" \
+ all libs install install_libs
+ touch $@
$(IPKG_OLSRD):
install -d -m0755 $(IDIR_OLSRD)/etc
$(IPKG_OLSRD):
install -d -m0755 $(IDIR_OLSRD)/etc
- cp -fpR $(PKG_
BUILD_DIR)/files/olsrd.conf.default.rfc $(IDIR_OLSRD)/etc/olsrd.conf
+ cp -fpR $(PKG_
INSTALL_DIR)/etc/olsrd.conf $(IDIR_OLSRD)/etc/
install -d -m0755 $(IDIR_OLSRD)/usr/sbin
install -d -m0755 $(IDIR_OLSRD)/usr/sbin
- cp -fpR $(PKG_
BUILD_DIR)
/olsrd $(IDIR_OLSRD)/usr/sbin/
+ cp -fpR $(PKG_
INSTALL_DIR)/usr/sbin
/olsrd $(IDIR_OLSRD)/usr/sbin/
install -d -m0755 $(IDIR_OLSRD)/etc/init.d
cp -fpR ./files/olsrd.init $(IDIR_OLSRD)/etc/init.d/olsrd
$(RSTRIP) $(IDIR_OLSRD)
install -d -m0755 $(IDIR_OLSRD)/etc/init.d
cp -fpR ./files/olsrd.init $(IDIR_OLSRD)/etc/init.d/olsrd
$(RSTRIP) $(IDIR_OLSRD)