openbsd-ports/x11/xview/config/patches/p-config-XView_rules

136 lines
5.6 KiB
Plaintext

--- config/XView.rules.orig 1993-06-29 07:13:20.000000000 +0200
+++ config/XView.rules 2003-12-30 01:49:19.000000000 +0100
@@ -1,6 +1,6 @@
-/**/###########################################################################
-/**/# @(#)XView.rules 1.8 12 May 1993 SMI
-/**/# XView.rules for XView release 3.0. Imake rules needed by distribution.
+XCOMM ##########################################################################
+XCOMM @(#)XView.rules 1.8 12 May 1993 SMI
+XCOMM XView.rules for XView release 3.0. Imake rules needed by distribution.
/*
***********************************************************************
@@ -83,8 +83,8 @@ name:: @@\
#ifndef InstallLibraryNoBuild
#define InstallLibraryNoBuild(libname,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a dest @@\
- -$(RANLIB) $(RANLIBINSTFLAGS) dest/lib/**/libname.a
+ -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a $(DESTDIR)dest @@\
+ -$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)dest/lib/**/libname.a
#endif /* InstallLibraryNoBuild */
@@ -93,7 +93,7 @@ install:: @@\
#ifndef InstallLibraryNoBuild
#define InstallLibraryNoBuild(libname,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a dest
+ -$(INSTALL) -c $(INSTLIBFLAGS) lib/**/libname.a $(DESTDIR)dest
#endif /* InstallLibraryNoBuild */
#endif /* DoRanlibCmd */
@@ -148,7 +148,7 @@ lib/**/libname.so.rev:: solist @@\
$(RM) $@~ sodir/lib/**/libname.so.xs.o @@\
@if [ -f xstrings ]; then \ @@\
$(RM) strings; $(CP) xstrings strings; fi @@\
- (cd sodir; $(LD) -o ../$@~ $(SHLIBLDFLAGS) ?*.o) @@\
+ (cd sodir; $(CC) -o ../$@~ -Wl,-soname,$@ $(SHLIBLDFLAGS) ?*.o) @@\
-@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
@@ -175,7 +175,8 @@ lib/**/libname.so.rev:: solist @@\
@if [ -f xstrings ]; then \ @@\
$(RM) strings; $(CP) xstrings strings; fi @@\
-@if [ ! -x objsort ];then $(CHMOD) 755 objsort;else exit 0;fi @@\
- $(LD) `objsort objlist sodir` -o $@~ $(SHLIBLDFLAGS) @@\
+ $(CC) `objsort objlist sodir` -o $@~ -Wl,-soname,$@\ @@\
+ $(SHLIBLDFLAGS) @@\
@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
@@ -343,8 +344,8 @@ objs: depends @@\
#ifndef InstallSharedLibraryDataNoBuild
#define InstallSharedLibraryDataNoBuild(libname,rev,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev dest @@\
- -$(RANLIB) $(RANLIBINSTFLAGS) dest/lib/**/libname.sa.rev
+ -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev $(DESTDIR)dest @@\
+ -$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)dest/lib/**/libname.sa.rev
#endif /* InstallSharedLibraryDataNoBuild */
@@ -354,7 +355,7 @@ install:: @@\
#ifndef InstallSharedLibraryDataNoBuild
#define InstallSharedLibraryDataNoBuild(libname,rev,dest) @@\
install:: @@\
- -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev dest
+ -$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.sa.rev $(DESTDIR)dest
#endif /* InstallSharedLibraryDataNoBuild */
@@ -366,9 +367,9 @@ install:: @@\
#ifndef InstallSharedLibraryNoBuild
#define InstallSharedLibraryNoBuild(libname,rev,dest) @@\
install:: @@\
- $(RM) /dest/lib/**/libname.so @@\
- $(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest @@\
- (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
+ $(RM) $(DESTDIR)/dest/lib/**/libname.so @@\
+ $(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev $(DESTDIR)dest @@\
+ (cd $(DESTDIR)dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
#endif /* InstallSharedLibraryNoBuild */
@@ -475,9 +476,9 @@ install:: @@\
for i in srcs ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i dest/.$$i; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
- ( cd dest; $(MV) $$i .$$i; $(LN) .$$i $$i ); \ @@\
+ $(RM) $(DESTDIR)dest/$$i $(DESTDIR)dest/.$$i; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
+ ( cd $(DESTDIR)dest; $(MV) $$i .$$i; $(LN) .$$i $$i ); \ @@\
done
#endif /* InstallSupportList */
@@ -491,8 +492,8 @@ install:: @@\
for i in srcs ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i ; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
+ $(RM) $(DESTDIR)dest/$$i ; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
done
#endif /* InstallNonExecList */
@@ -506,11 +507,11 @@ install.srcs:: @@\
for i in files ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i ; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
+ $(RM) $(DESTDIR)dest/$$i ; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
done @@\
- $(RM) dest/Makefile ; @@\
- $(INSTALL) -c $(INSTDATFLAGS) makefile dest/Makefile
+ $(RM) $(DESTDIR)dest/Makefile ; @@\
+ $(INSTALL) -c $(INSTDATFLAGS) makefile $(DESTDIR)dest/Makefile
#endif /* InstallExampleSrcs */
/*
@@ -524,8 +525,8 @@ install.srcs:: @@\
for i in files ;\ @@\
do \ @@\
echo "installing $$i"; \ @@\
- $(RM) dest/$$i ; \ @@\
- $(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
+ $(RM) $(DESTDIR)dest/$$i ; \ @@\
+ $(INSTALL) -c $(INSTDATFLAGS) $$i $(DESTDIR)dest ; \ @@\
done
#endif /* InstallExampleSrcsNoMakefile */