5b43672948
- Clean up patch logic. - Mark as BROKEN for obvious incompleteness: Blindly builds as 32-bit/ little endian on all archs, doesn't honor CC/CXX/C(XX)FLAGS.
47 lines
1.9 KiB
Plaintext
47 lines
1.9 KiB
Plaintext
$OpenBSD: patch-pwlib_make_lib_mak,v 1.1 2002/08/02 21:28:34 naddy Exp $
|
|
--- pwlib/make/lib.mak.orig Fri Feb 1 12:11:27 2002
|
|
+++ pwlib/make/lib.mak Fri Aug 2 21:40:17 2002
|
|
@@ -84,14 +84,14 @@
|
|
|
|
LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION)
|
|
LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION)
|
|
-LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER)$(BUILD_TYPE)
|
|
+LIBNAME_PAT = $(LIBNAME_MIN)
|
|
|
|
CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_FILENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN)
|
|
|
|
ifneq ($(P_SHAREDLIB),1)
|
|
STATIC_LIB_FILE=$(LIBDIR)/$(LIB_FILENAME)
|
|
else
|
|
-STATIC_LIB_FILE=$(LIBDIR)/lib$(LIB_BASENAME)_s.a
|
|
+STATIC_LIB_FILE=$(LIBDIR)/lib$(LIB_BASENAME).a
|
|
|
|
ifndef MAJOR_VERSION
|
|
MAJOR_VERSION := 1
|
|
@@ -146,9 +146,9 @@ LD = $(CPLUS)
|
|
endif
|
|
|
|
$(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)
|
|
- cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)
|
|
- cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
|
|
- cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
|
|
+# cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)
|
|
+# cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
|
|
+# cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
|
|
|
|
$(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
|
|
@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
|
|
@@ -156,9 +156,9 @@ $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_F
|
|
|
|
install: $(LIBDIR)/$(LIBNAME_PAT)
|
|
$(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
|
|
- ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME)
|
|
- ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
|
|
- ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
|
|
+# ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME)
|
|
+# ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
|
|
+# ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
|
|
|
|
endif # P_SHAREDLIB
|
|
|