105 lines
3.3 KiB
Plaintext
105 lines
3.3 KiB
Plaintext
$OpenBSD: patch-cups_Makefile,v 1.7 2010/06/27 04:18:50 ajacoutot Exp $
|
|
--- cups/Makefile.orig Fri Apr 23 20:56:34 2010
|
|
+++ cups/Makefile Sun Jun 27 06:09:50 2010
|
|
@@ -225,10 +225,6 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL6
|
|
echo Installing libraries in $(LIBDIR)...
|
|
$(INSTALL_DIR) -m 755 $(LIBDIR)
|
|
$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
|
|
- if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
|
|
- $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
|
|
- $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
|
|
- fi
|
|
if test $(LIBCUPS) = "libcups.2.dylib"; then \
|
|
$(RM) $(LIBDIR)/libcups.dylib; \
|
|
$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
|
|
@@ -247,14 +243,14 @@ installstatic:
|
|
install32bit:
|
|
echo Installing libraries in $(LIB32DIR)...
|
|
$(INSTALL_DIR) -m 755 $(LIB32DIR)
|
|
- $(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2
|
|
- $(LN) libcups.so.2 $(LIB32DIR)/libcups.so
|
|
+ $(INSTALL_LIB) 32bit/libcups.so.${LIBcups_VERSION} $(LIB32DIR)/libcups.so.${LIBcups_VERSION}
|
|
+ $(LN) libcups.so.${LIBcups_VERSION} $(LIB32DIR)/libcups.so
|
|
|
|
install64bit:
|
|
echo Installing libraries in $(LIB64DIR)...
|
|
$(INSTALL_DIR) -m 755 $(LIB64DIR)
|
|
- $(INSTALL_LIB) 64bit/libcups.so.2 $(LIB64DIR)/libcups.so.2
|
|
- $(LN) libcups.so.2 $(LIB64DIR)/libcups.so
|
|
+ $(INSTALL_LIB) 64bit/libcups.so.${LIBcups_VERSION} $(LIB64DIR)/libcups.so.${LIBcups_VERSION}
|
|
+ $(LN) libcups.so.${LIBcups_VERSION} $(LIB64DIR)/libcups.so
|
|
|
|
|
|
#
|
|
@@ -269,7 +265,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
|
|
$(RM) $(LIBDIR)/libcups.sl
|
|
$(RM) $(LIBDIR)/libcups.sl.2
|
|
$(RM) $(LIBDIR)/libcups.so
|
|
- $(RM) $(LIBDIR)/libcups.so.2
|
|
+ $(RM) $(LIBDIR)/libcups.so.${LIBcups_VERSION}
|
|
-$(RMDIR) $(LIBDIR)
|
|
for file in $(HEADERS); do \
|
|
$(RM) $(INCLUDEDIR)/cups/$$file; \
|
|
@@ -278,51 +274,49 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
|
|
|
|
uninstall32bit:
|
|
$(RM) $(LIB32DIR)/libcups.so
|
|
- $(RM) $(LIB32DIR)/libcups.so.2
|
|
+ $(RM) $(LIB32DIR)/libcups.so.${LIBcups_VERSION}
|
|
-$(RMDIR) $(LIB32DIR)
|
|
|
|
uninstall64bit:
|
|
$(RM) $(LIB64DIR)/libcups.so
|
|
- $(RM) $(LIB64DIR)/libcups.so.2
|
|
+ $(RM) $(LIB64DIR)/libcups.so.${LIBcups_VERSION}
|
|
-$(RMDIR) $(LIB64DIR)
|
|
|
|
|
|
#
|
|
-# libcups.so.2, libcups.sl.2
|
|
+# libcups.so.${LIBcups_VERSION}, libcups.sl.2
|
|
#
|
|
|
|
-libcups.so.2 libcups.sl.2: $(LIBOBJS)
|
|
+libcups.so.${LIBcups_VERSION} libcups.sl.2: $(LIBOBJS)
|
|
echo Linking $@...
|
|
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
|
|
$(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
|
|
- $(RM) `basename $@ .2`
|
|
- $(LN) $@ `basename $@ .2`
|
|
|
|
|
|
#
|
|
-# 32bit/libcups.so.2
|
|
+# 32bit/libcups.so.${LIBcups_VERSION}
|
|
#
|
|
|
|
-32bit/libcups.so.2: $(LIB32OBJS)
|
|
+32bit/libcups.so.${LIBcups_VERSION}: $(LIB32OBJS)
|
|
echo Linking 32-bit $@...
|
|
-mkdir 32bit
|
|
$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBGSSAPI) \
|
|
$(DNSSDLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
|
|
$(RM) 32bit/libcups.so
|
|
- $(LN) libcups.so.2 32bit/libcups.so
|
|
+ $(LN) libcups.so.${LIBcups_VERSION} 32bit/libcups.so
|
|
|
|
|
|
#
|
|
-# 64bit/libcups.so.2
|
|
+# 64bit/libcups.so.${LIBcups_VERSION}
|
|
#
|
|
|
|
-64bit/libcups.so.2: $(LIB64OBJS)
|
|
+64bit/libcups.so.${LIBcups_VERSION}: $(LIB64OBJS)
|
|
echo Linking 64-bit $@...
|
|
-mkdir 64bit
|
|
$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBGSSAPI) \
|
|
$(DNSSDLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
|
|
$(RM) 64bit/libcups.so
|
|
- $(LN) libcups.so.2 64bit/libcups.so
|
|
+ $(LN) libcups.so.${LIBcups_VERSION} 64bit/libcups.so
|
|
|
|
|
|
#
|