From 4d108bb9afea9fcd1069034d7f6bbfa4e4b300b9 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@heap.zone>
Date: Sun, 20 Jan 2019 13:20:52 +0100
Subject: [PATCH] Adjust to new objfw-config package format

---
 Makefile                                   | 15 +++++++++------
 packages/ObjOpenSSL.in => ObjOpenSSL.oc.in |  2 +-
 configure.ac                               |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename packages/ObjOpenSSL.in => ObjOpenSSL.oc.in (75%)

diff --git a/Makefile b/Makefile
index 5aa5b19..d4f1ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/packages/ObjOpenSSL.in b/ObjOpenSSL.oc.in
similarity index 75%
rename from packages/ObjOpenSSL.in
rename to ObjOpenSSL.oc.in
index 3d115eb..2966203 100644
--- a/packages/ObjOpenSSL.in
+++ b/ObjOpenSSL.oc.in
@@ -1,3 +1,3 @@
-package_version 1
+package_description 1
 CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@"
 LIBS="@OPENSSL_LIBS@ $LIBS"
diff --git a/configure.ac b/configure.ac
index 17af7b0..23f56e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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