From f725f0dc49b28b19ff81db646495e1db0e2031f4 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 28 Mar 2007 00:06:18 +0000
Subject: [PATCH] tweak isakmpd & keynote makefiles

SVN-Revision: 6733
---
 package/isakmpd/Makefile                |  5 ++---
 package/keynote/Makefile                | 13 +++----------
 package/keynote/patches/001-build.patch | 12 +++++++++++-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index 615ed5b60c..4214fdb96c 100644
--- a/package/isakmpd/Makefile
+++ b/package/isakmpd/Makefile
@@ -34,11 +34,10 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		LINUX_DIR="$(LINUX_DIR)" \
-		EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote -I$(STAGING_DIR)/usr/include " \
-		EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+		EXTRA_CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote" \
+		EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
 
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		STAGING_DIR="$(STAGING_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALL="install -c" \
 		install-bin
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 47469b61c3..8bec6e7725 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -7,7 +7,6 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=keynote
 PKG_VERSION:=2.3
@@ -36,15 +35,9 @@ CONFIGURE_ARGS += \
 	--enable-static \
 	--enable-shared
 
-define Build/Compile
-	$(call Build/Compile/Default, \
-		LIBS="$(EXTRA_LDFLAGS) -L. -lkeynote -lm -lcrypto" \
-	)
-endef
-
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/include/keynote
+	$(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(STAGING_DIR)/usr/include/keynote/
 	mkdir -p $(STAGING_DIR)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libkeynote.a $(STAGING_DIR)/usr/lib/
 endef
@@ -56,7 +49,7 @@ endef
 
 define Package/keynote/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,keynote))
diff --git a/package/keynote/patches/001-build.patch b/package/keynote/patches/001-build.patch
index 05351f714c..b2258d4720 100644
--- a/package/keynote/patches/001-build.patch
+++ b/package/keynote/patches/001-build.patch
@@ -277,15 +277,25 @@ diff -ru keynote-2.3/keynote.y keynote-2.3.new/keynote.y
 diff -ru keynote-2.3/Makefile.in keynote-2.3.new/Makefile.in
 --- keynote-2.3/Makefile.in	2000-09-27 01:16:27.000000000 +0200
 +++ keynote-2.3.new/Makefile.in	2004-01-16 11:35:38.841528129 +0100
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,8 @@
  YACCFLAGS = -d -p kn -b k
  LEXFLAGS2 = -Pkv -s -i
  LEXFLAGS = -Cr -Pkn -s -i
 -CFLAGS = -O2 -Wall # -g
 +CFLAGS = -O2 -Wall -fno-strict-aliasing # -g
++LDFLAGS = @LDFLAGS@
  RMFLAGS2 = -rf
  RMFLAGS = -f
  NROFFFLAGS = -mandoc
+@@ -83,7 +84,7 @@
+ 	$(RANLIB) $(TARGET)
+ 
+ $(TARGET2): $(TARGET) $(OBJS2)
+-	$(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
++	$(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LDFLAGS) $(LIBS)
+ 
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ 	$(YACC) $(YACCFLAGS) keynote.y
 diff -ru keynote-2.3/signature.c keynote-2.3.new/signature.c
 --- keynote-2.3/signature.c	1999-10-12 00:34:31.000000000 +0200
 +++ keynote-2.3.new/signature.c	2004-01-16 11:30:48.062084986 +0100