65 lines
2.2 KiB
Plaintext
65 lines
2.2 KiB
Plaintext
$OpenBSD: patch-unix_Makefile,v 1.3 2004/06/24 21:35:15 sturm Exp $
|
|
--- unix/Makefile.orig Mon Mar 1 10:37:24 2004
|
|
+++ unix/Makefile Thu Jun 24 15:28:24 2004
|
|
@@ -42,8 +42,8 @@
|
|
# such as -DDOSWILD).
|
|
|
|
# UnZip flags
|
|
-CC = cc# try using "gcc" target rather than changing this (CC and LD
|
|
-LD = $(CC)# must match, else "unresolved symbol: ___main" is possible)
|
|
+#CC = cc# try using "gcc" target rather than changing this (CC and LD
|
|
+#LD = $(CC)# must match, else "unresolved symbol: ___main" is possible)
|
|
AS = as
|
|
LOC = $(LOCAL_UNZIP)
|
|
AF = $(LOC)
|
|
@@ -61,8 +61,8 @@ FL2 = $(LF2)
|
|
|
|
# general-purpose stuff
|
|
#CP = cp
|
|
-CP = ln
|
|
-LN = ln
|
|
+CP = ln -s
|
|
+LN = ln -sf
|
|
RM = rm -f
|
|
CHMOD = chmod
|
|
BINPERMS = 755
|
|
@@ -449,19 +449,17 @@ svr4package: unzips
|
|
@echo " "
|
|
|
|
install: $(MANS)
|
|
- -$(INSTALL_D) $(BINDIR)
|
|
- $(INSTALL_PROGRAM) $(UNZIPS) $(BINDIR)
|
|
- $(INSTALL) unix/zipgrep $(BINDIR)
|
|
+ -$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
|
|
+ $(BSD_INSTALL_PROGRAM) $(UNZIPS) $(BINDIR)
|
|
+ $(BSD_INSTALL_SCRIPT) unix/zipgrep $(BINDIR)
|
|
$(RM) $(BINDIR)/zipinfo$E
|
|
- $(LN) $(BINDIR)/unzip$E $(BINDIR)/zipinfo$E
|
|
- -$(INSTALL_D) $(MANDIR)
|
|
- $(INSTALL) man/funzip.1 $(MANDIR)/funzip.$(manext)
|
|
- $(INSTALL) man/unzip.1 $(MANDIR)/unzip.$(manext)
|
|
- $(INSTALL) man/unzipsfx.1 $(MANDIR)/unzipsfx.$(manext)
|
|
- $(INSTALL) man/zipgrep.1 $(MANDIR)/zipgrep.$(manext)
|
|
- $(INSTALL) man/zipinfo.1 $(MANDIR)/zipinfo.$(manext)
|
|
- $(CHMOD) $(BINPERMS) $(INSTALLEDBIN)
|
|
- $(CHMOD) $(MANPERMS) $(INSTALLEDMAN)
|
|
+ $(LN) $(TRUEPREFIX)/bin/unzip$E $(BINDIR)/zipinfo$E
|
|
+ -$(BSD_INSTALL_MAN_DIR) $(MANDIR)
|
|
+ $(BSD_INSTALL_MAN) man/funzip.1 $(MANDIR)/funzip.$(manext)
|
|
+ $(BSD_INSTALL_MAN) man/unzip.1 $(MANDIR)/unzip.$(manext)
|
|
+ $(BSD_INSTALL_MAN) man/unzipsfx.1 $(MANDIR)/unzipsfx.$(manext)
|
|
+ $(BSD_INSTALL_MAN) man/zipgrep.1 $(MANDIR)/zipgrep.$(manext)
|
|
+ $(BSD_INSTALL_MAN) man/zipinfo.1 $(MANDIR)/zipinfo.$(manext)
|
|
|
|
uninstall:
|
|
$(RM) $(INSTALLEDBIN) $(INSTALLEDMAN)
|
|
@@ -569,8 +567,6 @@ generic_shlib: unix_make
|
|
$(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DUNIX $(LOC)"
|
|
gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
|
|
$(RM) libunzip.so.0 libunzip.so
|
|
- $(LN) -s libunzip.so.0.4 libunzip.so.0
|
|
- $(LN) -s libunzip.so.0 libunzip.so
|
|
gcc -c -O unzipstb.c
|
|
gcc -o unzip_shlib unzipstb.o -L. -lunzip
|
|
|