summaryrefslogtreecommitdiff
path: root/x11/lesstif/patches/patch-ai
blob: 3e7ae5989b458c1dcc2699fa8de8f6dc4cf02d7f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
$NetBSD: patch-ai,v 1.15 2000/12/22 17:26:19 jlam Exp $

--- clients/Motif-2.1/mwm/Makefile.am.orig	Tue Dec 19 05:47:42 2000
+++ clients/Motif-2.1/mwm/Makefile.am
@@ -4,8 +4,12 @@
 
 if Version_2_1
 bin_PROGRAMS=	mwm
-endif
+if DefaultVersion21
+bindir = $(prefix)/bin
+else
 bindir = $(prefix)/LessTif/Motif2.1/bin
+endif
+endif
 
 MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h
 
@@ -72,10 +76,12 @@
 LDADD=		../../../lib/Xm-2.1/libXm.la \
 		$(X_LIBS) $(LIBXP) -lXt $(X_PRE_LIBS) -lXext -lX11 ${X_EXTRA_LIBS}
 
+if Version_2_1
 appdir=		$(libdir)/X11/app-defaults
 
 mwmddir=	$(libdir)/X11/mwm
 mwmd_DATA=	system.mwmrc alt.map README
+endif
 
 
 $(mwmd_DATA) Mwm.ad:
@@ -91,12 +97,6 @@
 	      rm $$i; \
 	   fi ; \
 	   done
-
-install-data-hook:
-if DefaultVersion21
-	-rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS)
-	(cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .)
-endif
 
 install-data-local:
 if DefaultVersion21