modify makefile and script to work with previous commit

last commit created discrepencies in makefile and gen-gdbus-interfaces.sh, fix

diff --git a/Makefile b/Makefile
index b80240374cee4930253d07e96a2f3d72c9a3e305..8ad85c63ca67ab0cc9c59c06cdd4cb3e0d6c8efd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,16 @@ GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
 SANITY=-Wno-unused-variable -Wno-unused-parameter # -Wno-comment
 
 PREFIX=/usr/local
+LIBDIR=$(PREFIX)/lib
+OUR_LIBDIR=$(LIBDIR)/systemd-compat
 SYSCONFDIR=/etc
+
 SRCDIR=src
+CONFDIR=conf
+POLICYDIR=$(CONFDIR)/sysbus-policy
+ISPECTDIR=$(CONFDIR)/introspect-xml
+SERVICEFDIR=$(CONFDIR)/service-files
+
 INTFDIR=$(SRCDIR)/interfaces
 
 DBUS_POLICYDIR=$(SYSCONFDIR)/dbus-1/system.d
@@ -67,10 +75,10 @@ _generate_genfiles:
        $(INVOKE_GENFILE_SCRIPT) logind
 
 _install_conf:
-       cp conf/*-dbus.conf               $(DBUS_POLICYDIR)/
-       cp conf/org.freedesktop.*.service $(DBUS_CONFIGDIR)/
-       cp conf/systemd_compat.conf       $(SYSCONFDIR)/
+       cp $(POLICYDIR)/*-dbus.conf       $(DBUS_POLICYDIR)/
+       cp $(SERVICEFDIR)/*.service       $(DBUS_CONFIGDIR)/
+       cp $(CONFDIR)/systemd_compat.conf $(SYSCONFDIR)/
 
 _install_interface_binaries: $(LINKHN)
-       mkdir $(PREFIX)/bin/systemd-compat
-       cp bin/systemd-* $(PREFIX)/bin/systemd-compat/
+       mkdir -p $(OUR_LIBDIR)
+       cp bin/systemd-* $(OUR_LIBDIR)/ 

diff --git a/scripts/gen-gdbus-interfaces.sh b/scripts/gen-gdbus-interfaces.sh
index 632b8f39e4612e9a4db9b75fddb4453ff10a7cfa..7b1390508b7b675d6e21d00a2002419111a7b909 100755 (executable)
--- a/scripts/gen-gdbus-interfaces.sh
+++ b/scripts/gen-gdbus-interfaces.sh
@@ -33,7 +33,7 @@ gdbus-codegen \
 --interface-prefix org.freedesktop. \
 --generate-docbook $REPO/doc/$1-docbook.xml \
 --generate-c-code  $1-gen \
-$REPO/conf/$1-ispect.xml
+$REPO/conf/introspect-xml/$1-ispect.xml
 
 echo "Success"
 exit 0