Fix BitchX compilation, remove previous declarations of some variables, closes #425

[openwrt.git] / openwrt / package / nfs-server / Makefile

diff --git a/openwrt/package/nfs-server/Makefile b/openwrt/package/nfs-server/Makefile
index 1f72ddf..32bad9b 100644 (file)
--- a/openwrt/package/nfs-server/Makefile
+++ b/openwrt/package/nfs-server/Makefile
@@ -22,6 +22,8 @@ $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (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) \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \


@@ -43,17 +45,17 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        );
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        );

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR)
 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR)

-       touch $(PKG_BUILD_DIR)/.built
+       touch $@

 
 $(IPKG_NFS_SERVER):
        install -d -m0755 $(IDIR_NFS_SERVER)/etc
        install -m0644 ./files/nfsd.exports $(IDIR_NFS_SERVER)/etc/exports
        install -d -m0755 $(IDIR_NFS_SERVER)/etc/init.d
 
 $(IPKG_NFS_SERVER):
        install -d -m0755 $(IDIR_NFS_SERVER)/etc
        install -m0644 ./files/nfsd.exports $(IDIR_NFS_SERVER)/etc/exports
        install -d -m0755 $(IDIR_NFS_SERVER)/etc/init.d

-       install -m0644 ./files/nfsd.init $(IDIR_NFS_SERVER)/etc/init.d/S60nfsd
+       install -m0755 ./files/nfsd.init $(IDIR_NFS_SERVER)/etc/init.d/S60nfsd

        install -d -m0755 $(IDIR_NFS_SERVER)/usr/sbin
        install -m0755 $(PKG_BUILD_DIR)/rpc.* $(IDIR_NFS_SERVER)/usr/sbin/
        $(RSTRIP) $(IDIR_NFS_SERVER)
        install -d -m0755 $(IDIR_NFS_SERVER)/usr/sbin
        install -m0755 $(PKG_BUILD_DIR)/rpc.* $(IDIR_NFS_SERVER)/usr/sbin/
        $(RSTRIP) $(IDIR_NFS_SERVER)