several smaller fixes for installation. Honor DESTDIR, changed destination of so…

…me files...this is still not perfect but at least installs with an ebuild on my machine.

@@ -12,7 +12,7 @@ myetc_DATA = config/mime.types \
 	     config/taskrambler.pem \
 	     config/taskrambler.crt
 
-nobase_varlib_DATA = assets/html/example.html \
+nobase_trdata_DATA = assets/html/example.html \
 		     assets/html/_footer.html \
 		     assets/html/_login.html \
 		     assets/html/_menu.html \
@@ -72,21 +72,21 @@ coverage-html:
 	-$(MAKE) -C tests $(AM_MAKEFLAGS) -k $@
 endif
 
-TR_DIRS = $(varlibdir)/assets/doc \
-	  $(varlibdir)/assets/html/doc \
-	  $(varlibdir)/assets/coverage \
-	  $(varlibdir)/assets/html/coverage \
-	  $(varrundir) \
-	  $(trdatadir)/docs/api/
+TR_DIRS = $(DESTDIR)/$(trdatadir)/assets/doc \
+	  $(DESTDIR)/$(trdatadir)/assets/html/doc \
+	  $(DESTDIR)/$(trdatadir)/assets/coverage \
+	  $(DESTDIR)/$(trdatadir)/assets/html/coverage \
+	  $(DESTDIR)/$(trstatedir) \
+	  $(DESTDIR)/$(trdatadir)/docs/
 
 install-data-hook:
-	mkdir -p $(TR_DIRS)
-	if [ -d docs/api/ ]; then cp -Rfd docs/api/ $(trdatadir)/docs/; fi
-	if [ -d tests/coverage/ ]; then cp -Rfd tests/coverage/ $(trdatadir)/docs/; fi
-	$(LN_S) -f $(trdatadir)/docs/api/$(PACKAGE_VERSION)/html $(varlibdir)/assets/doc/$(PACKAGE_VERSION)
-	$(LN_S) -f $(trdatadir)/docs/api/$(PACKAGE_VERSION)/html $(varlibdir)/assets/html/doc/$(PACKAGE_VERSION)
-	$(LN_S) -f $(trdatadir)/docs/coverage/$(PACKAGE_VERSION) $(varlibdir)/assets/coverage/$(PACKAGE_VERSION)
-	$(LN_S) -f $(trdatadir)/docs/coverage/$(PACKAGE_VERSION) $(varlibdir)/assets/html/coverage/$(PACKAGE_VERSION)
+	$(INSTALL) -d -m 755 $(TR_DIRS)
+	if [ -d docs/api/ ]; then cp -Rfd docs/api/ $(DESTDIR)/$(trdatadir)/docs/; fi
+	if [ -d tests/coverage/ ]; then cp -Rfd tests/coverage/ $(DESTDIR)/$(trdatadir)/docs/; fi
+	$(LN_S) -f $(DESTDIR)/$(trdatadir)/docs/api/$(PACKAGE_VERSION)/html $(DESTDIR)/$(trdatadir)/assets/doc/$(PACKAGE_VERSION)
+	$(LN_S) -f $(DESTDIR)/$(trdatadir)/docs/api/$(PACKAGE_VERSION)/html $(DESTDIR)/$(trdatadir)/assets/html/doc/$(PACKAGE_VERSION)
+	$(LN_S) -f $(DESTDIR)/$(trdatadir)/docs/coverage/$(PACKAGE_VERSION) $(DESTDIR)/$(trdatadir)/assets/coverage/$(PACKAGE_VERSION)
+	$(LN_S) -f $(DESTDIR)/$(trdatadir)/docs/coverage/$(PACKAGE_VERSION) $(DESTDIR)/$(trdatadir)/assets/html/coverage/$(PACKAGE_VERSION)
 
 uninstall-hook:
 	rm -Rf $(varlibdir) $(varrundir) $(trdatadir)

 EXTRA_DIST = openssl.cnf taskrambler.conf.in mime.types
 
+.PHONY: update-config
+
+edit = sed \
+       -e 's,@trdatadir\@,$(trdatadir),g' \
+       -e 's,@trstatedir\@,$(trstatedir),g'
+
+taskrambler.conf: taskrambler.conf.in
+	$(edit) taskrambler.conf.in >taskrambler.conf
+
 taskrambler.pem:
 	openssl req -new -nodes -out taskrambler.csr -config openssl.cnf
 
 taskrambler.crt:
 	openssl req -new -x509 -key taskrambler.pem -out taskrambler.crt -config openssl.cnf
 
-all-local: taskrambler.pem taskrambler.crt
+all-local: taskrambler.pem taskrambler.crt taskrambler.conf
 
 clean-local:
-	rm -f taskrambler.csr taskrambler.pem taskrambler.crt
+	rm -f taskrambler.csr taskrambler.pem taskrambler.crt taskrambler.conf

@@ -18,6 +18,6 @@
 
 ldap_base	"ou=user,dc=yabrog,dc=weird-web-workers,dc=org"
 ldap_host	"ldap://hosted/"
-assets_dir	"@prefix@/var/lib/taskrambler"
-runtime_dir	"@prefix@/var/run/taskrambler"
+assets_dir	"@trdatadir@"
+runtime_dir	"@trstatedir@"
 port            11212

@@ -8,7 +8,7 @@ AC_INIT([taskrambler],
 LT_INIT
 AM_INIT_AUTOMAKE
 #AM_INIT_AUTOMAKE([subdir-objects])
-#AM_SILENT_RULES([yes])
+AM_SILENT_RULES([yes])
 AC_COPYRIGHT([Copyright © 2013 Georg Hopp])
 AC_REVISION([m4_esyscmd_s([git describe --always])])
 AC_CONFIG_SRCDIR([src/taskrambler.c])
@@ -62,16 +62,12 @@ AC_TYPE_SIZE_T
 #AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset])
 
-myetcdir=${sysconfdir}/taskrambler
-varlibdir=${localstatedir}/lib/taskrambler
-varrundir=${localstatedir}/run/taskrambler
-trdatadir=${datadir}/taskrambler
-trlibdir=${libdir}/taskrambler
+myetcdir="${sysconfdir}/taskrambler"
+trstatedir="${localstatedir}/taskrambler"
+trdatadir="${datarootdir}/taskrambler"
 AC_SUBST(myetcdir)
-AC_SUBST(varlibdir)
-AC_SUBST(varrundir)
+AC_SUBST(trstatedir)
 AC_SUBST(trdatadir)
-AC_SUBST(trlibdir)
 
 AM_CFLAGS="${AM_CFLAGS} ${DRAGONEGG_FLAGS}"
 AM_CFLAGS="${AM_CFLAGS} ${MEM_OPT_FLAGS}"
@@ -80,8 +76,7 @@ AM_CFLAGS="${AM_CFLAGS} -DCONFIGDIR=\\\"${myetcdir}\\\""
 AM_CFLAGS="${AM_CFLAGS} ${CFLAGS}"
 AC_SUBST(AM_CFLAGS)
 
-AC_CONFIG_FILES([config/taskrambler.conf
-		 assets/html/_documentation.html])
+AC_CONFIG_FILES([assets/html/_documentation.html])
 
 AC_CONFIG_FILES([Makefile
 		 src/Makefile

@@ -54,7 +54,7 @@ libtrhttpserver_la_LIBADD  = $(TRHTTPSERVER)
 
 taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS)
 taskrambler_CFLAGS  = $(AM_CFLAGS)
-taskrambler_LDADD   = $(TRLIBS) $(USEDLIBS) $(TR)
+taskrambler_LDADD   = $(TRLIBS) $(TR) $(USEDLIBS)
 
 SUBDIRS = asset auth cbuf class hash queue http \
 	  logger server session socket stream tree application \