diff options
| author | kremlin <ian@kremlin.cc> | 2014-07-23 05:34:50 +0800 |
|---|---|---|
| committer | kremlin <ian@kremlin.cc> | 2014-07-23 05:34:50 +0800 |
| commit | 2891a83f364c53e2af3a1a614aa3f5e09f9bad45 (patch) | |
| tree | a9209fa4310db238687cfd82f8de0bc37863f4b7 /Makefile | |
| parent | 6ee53149e94fcbee0c2b89129d47dc442b3f17e4 (diff) | |
| download | systembsd-2891a83f364c53e2af3a1a614aa3f5e09f9bad45.tar systembsd-2891a83f364c53e2af3a1a614aa3f5e09f9bad45.tar.gz systembsd-2891a83f364c53e2af3a1a614aa3f5e09f9bad45.tar.bz2 systembsd-2891a83f364c53e2af3a1a614aa3f5e09f9bad45.tar.lz systembsd-2891a83f364c53e2af3a1a614aa3f5e09f9bad45.tar.xz systembsd-2891a83f364c53e2af3a1a614aa3f5e09f9bad45.tar.zst systembsd-2891a83f364c53e2af3a1a614aa3f5e09f9bad45.zip | |
modify makefile and script to work with previous commit
last commit created discrepencies in makefile and gen-gdbus-interfaces.sh, fix
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -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)/ |