+--- WindowMaker-0.80.0/util/Makefile.am~ Thu Oct 11 11:59:54 2001
++++ WindowMaker-0.80.0/util/Makefile.am Thu Jan 3 07:12:53 2002
+@@ -1,8 +1,6 @@
+
+ AUTOMAKE_OPTIONS = no-dependencies
+
+-pkgdatadir = $(datadir)/@PACKAGE@
+-
+ bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
+
+ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\
+@@ -12,41 +10,41 @@
+ wkdemenu.pl wmchlocale.in wcopy wpaste
+
+ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+- @HEADER_SEARCH_PATH@ \
+- -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
++ $(HEADER_SEARCH_PATH) \
++ -DETCDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\"
+
+-liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
++liblist= $(LIBRARY_SEARCH_PATH) $(INTLIBS)
+
+-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
+
+-wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
+
+-wxcopy_LDADD = @XLFLAGS@ @XLIBS@
++wxcopy_LDADD = $(XLFLAGS) $(XLIBS)
+
+-wxpaste_LDADD = @XLFLAGS@ @XLIBS@
++wxpaste_LDADD = $(XLFLAGS) $(XLIBS)
+
+-getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
+
+ setstyle_LDADD = \
+- $(top_builddir)/WINGs/libWUtil.a \
+- @XLFLAGS@ @XLIBS@ $(liblist)
++ $(top_builddir)/WINGs/libWUtil.la \
++ $(XLFLAGS) $(XLIBS) $(liblist)
+
+-seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
++seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
+
+-geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
++geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)