diff options
| -rw-r--r-- | mk/image.mk | 4 | ||||
| -rw-r--r-- | package/squid/Config.in | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/image.mk b/mk/image.mk index 50c5d8b95..1b92da0df 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -6,8 +6,8 @@ imageprepare: kernel-install image-prepare-post extra-install # if an extra directory exist in TOPDIR, copy all content over the # root directory, do the same if make extra=/dir/to/extra is used extra-install: - if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi - if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi + @if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi + @if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi image-prepare-post: rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \ diff --git a/package/squid/Config.in b/package/squid/Config.in index c597986d8..61eb6ac75 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -32,7 +32,8 @@ config ADK_COMPILE_SQUID_WITH_UCLIBCXX endchoice -menu "squid............................. proxy and web cache modules" +menu "squid-modules...................... proxy and web cache modules" +depends on ADK_PACKAGE_SQUID config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM prompt "squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper" |