various minor package compilation issues

git-svn-id: svn://svn.openwrt.org/openwrt/packages@7513 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 27bd72a..5385939 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -72,7 +72,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-       rm      $(STAGING_DIR)/usr/bin/apr-config \
+       -rm     $(STAGING_DIR)/usr/bin/apr-config \
                $(STAGING_DIR)/usr/include/apr-0/{apr_allocator.h,apr_atomic.h,apr_compat.h,apr_dso.h,apr_env.h,apr_errno.h,apr_file_info.h,apr_file_io.h,apr_fnmatch.h,apr_general.h,apr_getopt.h,apr_global_mutex.h,apr.h,apr_hash.h,apr_inherit.h,apr_lib.h,apr_mmap.h,apr_network_io.h,apr_poll.h,apr_pools.h,apr_portable.h,\apr_proc_mutex.h,\apr_ring.h,apr_shm.h,apr_signal.h,apr_strings.h,apr_support.h,apr_tables.h,apr_thread_cond.h,apr_thread_mutex.h,apr_thread_proc.h,apr_thread_rwlock.h,apr_time.h,apr_user.h,apr_version.h,apr_want.h} \
                $(STAGING_DIR)/usr/lib/libapr-0* \
                $(STAGING_DIR)/usr/share/build/{apr_rules.mk,libtool,make_exports.awk,make_var_export.awk,mkdir.sh}

diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile
index 586786d..4d5d62b 100644 (file)
--- a/libs/libjpeg/Makefile
+++ b/libs/libjpeg/Makefile
@@ -66,7 +66,8 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                prefix="$(PKG_INSTALL_DIR)/usr" \
                exec_prefix="$(PKG_INSTALL_DIR)/usr" \
-               all install-headers install-lib install
+               all install-headers install-lib install \
+               LIBTOOL="./libtool --tag=CC"
 endef
 
 define Build/InstallDev

diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index 7f4a8c5..dada35b 100644 (file)
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -38,7 +38,8 @@ endef
 define Build/Configure
        $(call Build/Configure/Default,\
                --with-nagios-user="root" \
-               --with-nagios-group="root" \
+               --with-nagios-group="root", \
+               LIBS="-lnotimpl" \
        )
 endef