Adjust to new objfw-config package format

This commit is contained in:
Jonathan Schleifer 2019-01-20 13:20:52 +01:00
parent f4de27ae12
commit 4d108bb9af
No known key found for this signature in database
GPG key ID: 79D21189A2D4708D
3 changed files with 11 additions and 8 deletions

View file

@ -4,20 +4,23 @@ 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

View file

@ -1,3 +1,3 @@
package_version 1
package_description 1
CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@"
LIBS="@OPENSSL_LIBS@ $LIBS"

View file

@ -74,5 +74,5 @@ 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