Description: Fix makefile and configure.ac for Debian
Author: Maarten L. Hekkelman <maarten@hekkelman.com>
Last-Update: Tue, 17 Nov 2020 19:41:33 +0100
Forwarded: yes

--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -28,24 +28,27 @@
 firstTarget: all
 
 CXX					= @CXX@
-CXXFLAGS			= @CXXFLAGS@ @BOOST_CPPFLAGS@ @LIBBZ2_CPPFLAGS@
-LDFLAGS				= @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@ @LIBBZ2_LDFLAGS@
+CXXFLAGS			= @CPPFLAGS@ @CXXFLAGS@ @BOOST_CPPFLAGS@
+LDFLAGS				= @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
 LIBS				= @LIBS@ \
+					  -latomic \
 					  @BOOST_IOSTREAMS_LIB@ \
 					  @BOOST_DATE_TIME_LIB@
 
-prefix				= @prefix@
+prefix				= $(DESTDIR)@prefix@
 exec_prefix			= @exec_prefix@
 libdir				= @libdir@
 includedir			= @includedir@
 datarootdir			= @datarootdir@
 datadir				= @datadir@
+docdir				= @docdir@
 pkgconfigdir		= $(libdir)/pkgconfig
 
 CCP4DIR				= @CCP4@
 CLIBD				= $(CCP4DIR:%=%/lib/data)
 
-CACHE_DIR			= /var/cache/libcifpp
+CACHE_DIR			= $(DESTDIR)/var/cache/libcifpp
+CRON_DIR			= $(DESTDIR)/etc/cron.weekly
 
 DEFINES				+= CACHE_DIR='"$(CACHE_DIR)"'
 
@@ -239,22 +242,33 @@
 	Secondary.hpp \
 	TlsParser.hpp
 
-.PHONY: install
-install: lib
+.PHONY: install-lib
+install-lib: lib
 	install -d $(libdir)
 	$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+	rm -f $(libdir)/$(LIB_NAME).so $(libdir)/$(LIB_NAME).a $(libdir)/$(LIB_NAME).la
+	install -d $(datadir)/libcifpp
 	install -d $(CACHE_DIR)
 	for d in isomers.txt dictionaries/mmcif_ddl.dic dictionaries/mmcif_pdbx_v50.dic; do \
-		install -m644 rsrc/$$d $(CACHE_DIR)/; \
+		install -m644 rsrc/$$d $(datadir)/libcifpp; \
 	done
-	if [ -d /etc/cron.weekly ]; then \
-		install -m755 tools/update-dictionaries-script /etc/cron.weekly/libcifpp; \
-	fi
+	gzip $(datadir)/libcifpp/*
+	install -d $(CRON_DIR)
+	install -m755 tools/update-dictionaries-script $(CRON_DIR)/libcifpp
+
+.PHONY: install-dev
+install-dev:
+	install -d $(libdir)
+	$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+	rm -f $(libdir)/$(LIB_NAME).so.$(subst :,.,$(LIB_VERSION)) $(libdir)/$(LIB_NAME).so.$(LIB_CURRENT)
 	install -d $(includedir)/cif++
 	for f in $(HEADERS); do install include/cif++/$$f $(includedir)/cif++/$$f; done
 	install -d $(pkgconfigdir)
 	install -m 644 $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
 
+.PHONY: install
+install: install-lib install-dev
+
 dist-clean: clean
 
 .PHONY: dist
--- a/configure.ac
+++ b/configure.ac
@@ -93,10 +93,5 @@
 AX_BOOST_IOSTREAMS
 AX_BOOST_DATE_TIME
 
-AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z], [],
-                 [AC_MSG_ERROR([libz not found - compressed files not supported])])
-AX_CHECK_LIBRARY([LIBBZ2], [bzlib.h], [bz2], [],
-                 [AC_MSG_ERROR([libbz2 not found - compressed files not supported])])
-
 AC_OUTPUT([GNUmakefile
 		   libcifpp.pc])
