diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 18:53:37 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 18:53:37 +0100 |
| commit | 76787296486ff5484b6f1ebbd93f6ea5bee81576 (patch) | |
| tree | d07439772f697491a2c166e679c78fbc000ca691 /package/cups | |
| parent | b9166d4308a7912c69f8bf4af59b35fc5f7d75be (diff) | |
| parent | c25486df9724185dfec39ae1b80253a3b1b213fd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cups')
| -rw-r--r-- | package/cups/Makefile | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile index 0d20cd61a..28bb45116 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -38,7 +38,9 @@ HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ --disable-openssl \ --disable-cdsassl \ --disable-dbus \ - --disable-ssl + --disable-ssl \ + --with-components=core \ + --with-rcdir=$(STAGING_HOST_DIR)/etc CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' @@ -57,7 +59,9 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --disable-openssl \ --disable-cdsassl \ --disable-dbus \ - --disable-ssl + --disable-ssl \ + --with-components=core \ + --with-rcdir=$(STAGING_TARGET_DIR)/etc FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) @@ -66,22 +70,9 @@ else XAKE_FLAGS+= OPTIM='-fPIC' endif -cups-hostpackage: - cups-install: - ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin - ${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin - ${INSTALL_DIR} ${IDIR_CUPS}/etc/cups - ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon - ${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/ - rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default - ${CP} ${WRKINST}/usr/bin/* ${IDIR_CUPS}/usr/bin/ - rm -f ${IDIR_CUPS}/usr/bin/cups-config + ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib ${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/cups/daemon/* \ - ${IDIR_CUPS}/usr/lib/cups/daemon/ - ${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/ - ${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/ include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |