diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/cifs-utils | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/cifs-utils')
| -rw-r--r-- | package/cifs-utils/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index c58a8ecd6..e0a60addf 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= cifs-utils PKG_VERSION:= 6.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 93697dbc043cb4d5c66e15e281f872e5 -PKG_DESCR:= CIFS network filesystem utilities +PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_BUILDDEP:= autotool PKG_URL:= https://wiki.samba.org/index.php/LinuxCIFS_utils @@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CIFS_UTILS,cifs-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_STATIC),y) -TARGET_LDFLAGS+= -static -endif - AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-cifsupcall \ --disable-cifsidmap \ |