summaryrefslogtreecommitdiff
path: root/cgi-bin
diff options
context:
space:
mode:
authorMichael R Sweet <michaelrsweet@gmail.com>2017-07-17 19:58:53 -0400
committerMichael R Sweet <michaelrsweet@gmail.com>2017-07-17 19:58:53 -0400
commitb94f7488e861c3119037efdf08257749fcce06b8 (patch)
tree69337d54eca699c6a330c4688a54d46e3bb8174b /cgi-bin
parentd2d605ff778b36f672ff1881059510e806389a2d (diff)
downloadcups-b94f7488e861c3119037efdf08257749fcce06b8.tar.gz
Fix more issues with libtool support (Issue #5050)
Diffstat (limited to 'cgi-bin')
-rw-r--r--cgi-bin/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index fefaebc5d..ae9630786 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -48,7 +48,7 @@ UNITTARGETS = \
TARGETS = \
$(LIBTARGETS) \
- $(LD_CGIS)
+ $(CGIS)
#
@@ -109,12 +109,12 @@ install-data:
install-exec:
$(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
- for file in $(LD_CGIS); do \
+ for file in $(CGIS); do \
$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
done
if test "x$(SYMROOT)" != "x"; then \
$(INSTALL_DIR) $(SYMROOT); \
- for file in $(LD_CGIS); do \
+ for file in $(CGIS); do \
cp $$file $(SYMROOT); \
dsymutil $(SYMROOT)/$$file; \
done \
@@ -161,7 +161,7 @@ installstatic:
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR)
$(RANLIB) $(LIBDIR)/libcupscgi.a
- $(LD_CHMOD) 555 $(LIBDIR)/libcupscgi.a
+ $(CHMOD) 555 $(LIBDIR)/libcupscgi.a
#
@@ -169,7 +169,7 @@ installstatic:
#
uninstall:
- for file in $(LD_CGIS); do \
+ for file in $(CGIS); do \
$(RM) $(SERVERBIN)/cgi-bin/$$file; \
done
-$(RMDIR) $(SERVERBIN)/cgi-bin
@@ -277,7 +277,7 @@ jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
makedocset: makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
echo Linking $@...
$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
- ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
$(LIBZ) $(LIBGSSAPI)
@@ -297,7 +297,7 @@ printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
testcgi: testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
echo Linking $@...
$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
- ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
$(LIBZ) $(LIBGSSAPI)
echo Testing CGI API...
./testcgi
@@ -310,7 +310,7 @@ testcgi: testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
testhi: testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
echo Linking $@...
$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
- ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
$(LIBZ) $(LIBGSSAPI)
echo Testing help index API...
./testhi
@@ -323,7 +323,7 @@ testhi: testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
testtemplate: testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
echo Linking $@...
$(LD_CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
- $(LD_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
+ $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
#