--- trunk/am-wrapper/Makefile	2012/09/11 14:16:50	1925
+++ trunk/am-wrapper/Makefile	2012/09/11 14:17:23	1926
@@ -1,19 +1,18 @@
-ARCH := $(patsubst i%86,i386,$(shell uname -m))
-PVER = $(shell cat VERSION)
 PNAME = automake
+PVER = $(shell cat VERSION)
 
-PREFIX = /usr
-
+ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ifeq (x86_64, $(ARCH))
-        LIBDIR = $(PREFIX)/lib64
+        LIB = lib64
 else
-        LIBDIR = $(PREFIX)/lib
+        LIB = lib
 endif
 
+PREFIX = /usr
 BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/${LIB}
 DATADIR = $(PREFIX)/share
 DOCDIR = $(DATADIR)/doc/${PNAME}-${PVER}
-MISCDIR = $(LIBDIR)/misc
 
 INSTALL = install
 LN_S = ln -s
@@ -26,13 +25,13 @@
 all:
 
 install:
-	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
-	$(INSTALL) -d $(DESTDIR)/$(LIBDIR)
-	$(INSTALL) -d $(DESTDIR)/${MISCDIR}
-	$(INSTALL) -d $(DESTDIR)/$(DATADIR)
+	$(INSTALL) -d $(DESTDIR)/${BINDIR}
+	$(INSTALL) -d $(DESTDIR)/${LIBDIR}
+	$(INSTALL) -d $(DESTDIR)/${LIBDIR}/misc
+	$(INSTALL) -d $(DESTDIR)/${DATADIR}
 	$(INSTALL) -d $(DESTDIR)/${DOCDIR}
 	$(INSTALL) -m 0755 ${WRAPPER} $(DESTDIR)/${MISCDIR}/
-	for i in ${PROGRAMS}; do $(LN_S) $(MISCDIR)/ac-wrapper.sh $(DESTDIR)/$(BINDIR)/$$i; done
+	for i in ${PROGRAMS}; do $(LN_S) ../$(LIB)/misc/${WRAPPER} $(DESTDIR)/$(BINDIR)/$$i; done
 	$(CAT) ChangeLog | $(GZIP) > $(DESTDIR)/${DOCDIR}/ChangeLog.gz
 	$(CAT) VERSION | $(GZIP) > $(DESTDIR)/${DOCDIR}/VERSION.gz