Add a patch from Alexander Holler to fix segfault with ipsec interfaces

[openwrt.git] / package / openwrt / libnvram / Makefile

diff --git a/package/openwrt/libnvram/Makefile b/package/openwrt/libnvram/Makefile
index 5d828b1..a5b6284 100644 (file)
--- a/package/openwrt/libnvram/Makefile
+++ b/package/openwrt/libnvram/Makefile
@@ -1,15 +1,5 @@
-#
-# Linux router shared code Makefile
-#
-# Copyright 2001-2003, Broadcom Corporation
-# All Rights Reserved.
-# 
-# THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
-# KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
-# SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
-#
 # $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnvram
@@ -31,15 +21,17 @@ $(foreach obj,$(OBJS),$(eval $(call OBJ_template,$(obj))))
 $(PKG_BUILD_DIR):
        mkdir -p $(PKG_BUILD_DIR)
 
-$(PKG_BUILD_DIR)/nvram: $(PKG_BUILD_DIR)/main.o
-       $(TARGET_CC) $(TARGET_CFLAGS) -o $@ $^ -L$(PKG_BUILD_DIR) -lnvram 
+$(PKG_BUILD_DIR)/nvram: $(PKG_BUILD_DIR)/main.o $(PKG_BUILD_DIR)/libnvram.so
+       $(TARGET_CC) $(TARGET_CFLAGS) -o $@ $< -L$(PKG_BUILD_DIR) -lnvram 
 
 $(PKG_BUILD_DIR)/libnvram.so: $(LIBNVRAM_OBJS)
        $(TARGET_CC) -shared -o $@ $^
+       
+$(STAGING_DIR)/lib/libnvram.so: $(PKG_BUILD_DIR)/libnvram.so
+       install -m 644 $< $@
 
 $(TARGET_DIR)/usr/lib/libnvram.so: $(PKG_BUILD_DIR)/libnvram.so
        install -m 644 $< $@
-       install -m 644 $< $(STAGING_DIR)/lib/libnvram.so
        $(STRIP) $@
 
 $(TARGET_DIR)/usr/sbin/nvram: $(PKG_BUILD_DIR)/nvram
@@ -47,7 +39,7 @@ $(TARGET_DIR)/usr/sbin/nvram: $(PKG_BUILD_DIR)/nvram
        install -m 755 $< $@
        $(STRIP) $@
 
-compile: $(PKG_BUILD_DIR)/libnvram.so $(PKG_BUILD_DIR)/nvram
+compile: $(PKG_BUILD_DIR)/libnvram.so $(STAGING_DIR)/lib/libnvram.so $(PKG_BUILD_DIR)/nvram
 install: $(TARGET_DIR)/usr/lib/libnvram.so $(TARGET_DIR)/usr/sbin/nvram
 
 clean: