Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -2,22 +2,25 @@ include buildsys.mk include extra.mk install-extra: - i=packages/ObjOpenSSL; \ + i=ObjOpenSSL.oc; \ + packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \ ${INSTALL_STATUS}; \ - if ${INSTALL} -m 644 $$i ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \ + if ${MKDIR_P} $$packagesdir && ${INSTALL} -m 644 $$i $$packagesdir/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ fi uninstall-extra: - i=packages/ObjOpenSSL; \ - if test -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \ - if rm -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \ + i=ObjOpenSSL.oc; \ + packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \ + if test -f $$packagesdir/$$i; then \ + if rm -f $$packagesdir/$$i; then \ ${DELETE_OK}; \ else \ ${DELETE_FAILED}; \ fi \ - fi + fi; \ + rmdir $$packagesdir >/dev/null 2>&1 || true ADDED ObjOpenSSL.oc.in Index: ObjOpenSSL.oc.in ================================================================== --- /dev/null +++ ObjOpenSSL.oc.in @@ -0,0 +1,3 @@ +package_description 1 +CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@" +LIBS="@OPENSSL_LIBS@ $LIBS" Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -72,7 +72,7 @@ AC_SUBST(CPPFLAGS) AC_SUBST(OPENSSL_CPPFLAGS) AC_SUBST(OPENSSL_LIBS) -AC_CONFIG_FILES([buildsys.mk extra.mk packages/ObjOpenSSL]) +AC_CONFIG_FILES([buildsys.mk extra.mk ObjOpenSSL.oc]) AC_OUTPUT DELETED packages/ObjOpenSSL.in Index: packages/ObjOpenSSL.in ================================================================== --- packages/ObjOpenSSL.in +++ /dev/null @@ -1,3 +0,0 @@ -package_version 1 -CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@" -LIBS="@OPENSSL_LIBS@ $LIBS"