fix BINNAME

artix-linux · Apr 8, 2018 · c5011b0 · c5011b0
1 parent 0b68356
commit c5011b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -12,29 +12,27 @@ DOCMODE = 0644
 INSTALL = install
 MAKE = make
 SYSTEMDCOMPAT = TRUE
-BINNAME = FALSE
 ifeq ($(SYSTEMDCOMPAT),TRUE)
 	BINPROGS = systemd-sysusers
 else
 	BINPROGS = opensysusers
 endif
+BINNAME = $(BINPROGS)
 
 all:
 	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man
-	[ "${BINNAME}" != 'FALSE' ] && sed -e "s|@BINFILE@|$(BINNAME)|" openrc/opensysusers.initd.in | tee openrc/opensysusers.initd
-	[ "${BINNAME}" == 'FALSE' ] && sed -e "s|@BINFILE@|$(BINPROGS)|" openrc/opensysusers.initd.in | tee openrc/opensysusers.initd
+	sed -e "s|@BINFILE@|$(BINNAME)|" openrc/opensysusers.initd.in | tee openrc/opensysusers.initd 1> /dev/null
 
 clean:
 	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man clean
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(BINDIR)
-	$(INSTALL) -m $(BINMODE) $(BINPROGS) $(DESTDIR)$(PREFIX)$(BINDIR)
+	$(INSTALL) -m $(BINMODE) $(BINPROGS) $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers
 	$(INSTALL) -m $(BINMODE) $(LIBS) $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers
-	for prog in ${BINPROGS}; do sed -e "s|@LIBDIR@|$(PREFIX)$(LIBDIR)|" -i $(DESTDIR)$(PREFIX)$(BINDIR)/$$prog; done
+	sed -e "s|@LIBDIR@|$(PREFIX)$(LIBDIR)|" -i $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
 	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man install
-	[ "${BINNAME}" != 'FALSE' ] && mv $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINPROGS) $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
 
 install-tests:
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(CONFDIR)
@@ -45,6 +43,6 @@ uninstall:
 	for lib in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers/$$lib; done
 	rm -rf --one-file-system $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers
 	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man uninstall
-	[ "${BINNAME}" != 'FALSE' ] && rm -f $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
+	rm -f $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
 
 .PHONY: all install install-tests uninstal
diff --git a/common.sh b/common.sh
@@ -188,4 +188,4 @@ sysusers_d=''
 replace=''
 
 sysusers_dirs="${root}/usr/lib/sysusers.d ${root}/run/sysusers.d ${root}/etc/sysusers.d"
-sysusersver='0.4.4'
+sysusersver='0.4.5'