$NetBSD: patch-ai,v 1.16 2001/06/30 19:08:23 jlam Exp $

--- clients/Motif-2.1/mwm/Makefile.am.orig	Tue May  1 08:37:20 2001
+++ clients/Motif-2.1/mwm/Makefile.am
@@ -4,8 +4,12 @@
 
 if Version_2_1
 bin_PROGRAMS=	mwm
-endif
+if DefaultVersion21
+bindir = $(exec_prefix)/bin
+else
 bindir = $(exec_prefix)/LessTif/Motif2.1/bin
+endif
+endif
 
 MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h
 
@@ -40,6 +44,7 @@
 # non-local stuff
 BUILT_SOURCES =	$(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0) $(mwmd_DATA) Mwm.ad
 
+if Version_2_1
 mwm_SOURCES =   $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0) $(HDRS_2_1) $(SRCS_2_1)
 
 $(SRCS_1_2) $(HDRS_1_2):
@@ -76,6 +81,7 @@
 
 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)$(exec_prefix)/bin/$(bin_PROGRAMS)
-	(cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .)
-endif
 
 install-data-local:
 if DefaultVersion21