From 5da48e461472590caea416fda443c3c8be3373c4 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 3 May 2019 12:29:58 -0400 Subject: Move ippeveprinter commands to CUPS_SERVERBIN/command. --- tools/Makefile | 10 +++++----- tools/ippeveprinter.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 43ba68847..479f2ba9f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -89,10 +89,10 @@ install-exec: for file in $(IPPTOOLS); do \ $(INSTALL_BIN) $$file $(BINDIR); \ done - echo Installing printer commands in $(SERVERBIN)/ippeveprinter... - $(INSTALL_DIR) -m 755 $(SERVERBIN)/ippeveprinter + echo Installing printer commands in $(SERVERBIN)/command... + $(INSTALL_DIR) -m 755 $(SERVERBIN)/command for file in $(IPPEVECOMMANDS); do \ - $(INSTALL_BIN) $$file $(SERVERBIN)/ippeveprinter; \ + $(INSTALL_BIN) $$file $(SERVERBIN)/command; \ done if test "x$(SYMROOT)" != "x"; then \ $(INSTALL_DIR) $(SYMROOT); \ @@ -127,9 +127,9 @@ uninstall: $(RM) $(BINDIR)/$$file; \ done -$(RMDIR) $(BINDIR) - echo Uninstalling print commands from $(SERVERBIN)/ippeveprinter... + echo Uninstalling print commands from $(SERVERBIN)/command... for file in $(IPPEVECOMMANDS); do \ - $(RM) $(SERVERBIN)/ippeveprinter/$$file; \ + $(RM) $(SERVERBIN)/command/$$file; \ done -$(RMDIR) $(SERVERBIN)/ippeveprinter diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c index 1ec874b55..4f6f0cf9b 100644 --- a/tools/ippeveprinter.c +++ b/tools/ippeveprinter.c @@ -1403,7 +1403,7 @@ create_printer( } else { - snprintf(path, sizeof(path), "%s/ippeveprinter/%s", cg->cups_serverbin, command); + snprintf(path, sizeof(path), "%s/command/%s", cg->cups_serverbin, command); if (access(command, X_OK)) { -- cgit v1.2.1