Upgrade to new build system

src/libiso8601/.params

@@ -1 +1 @@
-c lib libiso8601 iso8601.h
+lib c libiso8601 iso8601.h

src/libiso8601/build.install-lib

@@ -2,7 +2,7 @@ build_target libiso8601
 
 # make paths (this is for Gentoo in particular)
 build_dir_tree "${LIBDIR}" || return 1
-build_dir_tree "${PKGCONFDIR}" || return 1
+build_dir_tree "${BINDIR}" || return 1
 build_dir_tree "${INCLUDEDIR}" || return 1
 
 # install library
@@ -20,16 +20,20 @@ install_symlink "${BASE}" "${MAJOR}" "${LIBDIR}"
 echo "Installing header file '${libiso8601_HEADER}' into ${INCLUDEDIR}"
 install_header ${libiso8601_HEADER} ${INCLUDEDIR} 0644 || return 1
 
-# install pkgconfig file
-echo "Installing package config file into ${PKGCONFDIR}"
-PKGCONFFILE=${PKGCONFDIR}/libiso8601.pc
-do_cmd rm -f ${PKGCONFFILE}
-do_cmd_redir ${PKGCONFFILE} sed \
+# install config script
+echo "Installing config script into ${BINDIR}"
+CONFFILE="${BINDIR}/libiso8601-config"
+
+do_cmd rm -f "${CONFFILE}"
+do_cmd_redir "${CONFFILE}" sed \
     -e "s,@VERSION@,${VERSION}," \
-    -e "s,@LIBDIR@,${FINALLIBDIR}," \
-    -e "s,@INCLUDEDIR@,${FINALINCLUDEDIR}," \
-    src/libiso8601/pkgconf.in
-do_cmd chmod 0644 ${PKGCONFFILE}
+    -e "s,@DEP_CFLAGS@,${libiso8601_DEP_CFLAGS}," \
+    -e "s,@DEP_LIBS@,${libiso8601_DEP_LIBS}," \
+    -e "s,@LIB_DIR@,${FINALLIBDIR}," \
+    -e "s,@INCLUDE_DIR@,${FINALINCLUDEDIR}," \
+    src/libiso8601/config-script
+
+do_cmd chmod 0755 "${CONFFILE}"
 print_success "Done"
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

src/libiso8601/build.lib

@@ -3,6 +3,8 @@
 #  libiso8601_BUILT
 #  libiso8601_HEADER
 #  libiso8601_BASE
+#  libiso8601_DEP_CFLAGS
+#  libiso8601_DEP_LIBS
 
 if [ -z ${libiso8601_BUILT} ]
 then
@@ -10,7 +12,9 @@ then
     source src/libiso8601/soversion
 
     libiso8601="obj/${libiso8601_BASE}.so.${SOMAJOR}.${SOMINOR}.${SOMICRO}"
-    SO_EXTRA="-lrt -lc"
+    libiso8601_DEP_CFLAGS=""
+    libiso8601_DEP_LIBS=""
+    SO_EXTRA="${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} -lrt -lc"
 
     echo "Building library ${libiso8601}..."
 

src/tests/.params

@@ -1 +1 @@
-c tests tests libiso8601
+tests c tests libiso8601