--- Makefile.am	2004-03-22 11:00:17.278961100 -0500
+++ Makefile.am.new	2004-03-22 16:20:23.761677900 -0500
@@ -23,34 +23,34 @@ cygwinbin:
 	$(MAKE) -C $(top_builddir) DESTDIR=$(cygwintmp) install-strip
 # $(STRIP) $(cygwintmp)/usr/bin/cygcurl-?.dll
 	$(mkinstalldirs) \
-	  $(cygwintmp)/usr/doc/Cygwin \
-	  $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) \
-	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl \
-	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples \
-	  $(cygwintmp)-dev/usr/man
+	  $(cygwintmp)$(datadir)/doc/Cygwin \
+	  $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) \
+	  $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/libcurl \
+	  $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples \
+	  $(cygwintmp)-dev$(mandir)
 #
 # copy some files into the binary install dir
 	cp $(srcdir)/README \
-	  $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
+	  $(cygwintmp)$(datadir)/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
 	cd $(top_srcdir) ; cp CHANGES COPYING README RELEASE-NOTES docs/* \
-	  $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; pwd
-	cd $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; rm *.1 Makefile*
+	  $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) ; pwd
+	cd $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) ; rm *.1 Makefile*
 #
 # copy some files into the -dev install dir, remove some from binary
 	cp $(top_srcdir)/docs/libcurl/*.html \
-	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl
+	  $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/libcurl
 	cp $(top_srcdir)/docs/examples/* \
-	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
-	rm $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples/Makefile*
+	  $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples
+	rm $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples/Makefile*
 	cp $(top_srcdir)/docs/examples/Makefile.example \
-	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
-	mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/BINDINGS \
-	   $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
-	mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/INTERNALS \
-	   $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
+	  $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples
+	mv $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION)/BINDINGS \
+	   $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)
+	mv $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION)/INTERNALS \
+	   $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)
 	mv $(cygwintmp)/usr/include $(cygwintmp)-dev/usr
 	mv $(cygwintmp)/usr/lib $(cygwintmp)-dev/usr
-	mv $(cygwintmp)/usr/man/man3 $(cygwintmp)-dev/usr/man
+	mv $(cygwintmp)$(mandir)/man3 $(cygwintmp)-dev$(mandir)
 #
 # create both tar files, and delete tmp folders
 	cd $(cygwintmp) ; tar cjf \
@@ -60,4 +60,3 @@ cygwinbin:
 	cd $(cygwintmp)-dev ; tar cjf \
 	  $(PACKAGE)-devel-$(VERSION)-$(CYGBUILD).tar.bz2 usr
 	mv $(cygwintmp)-dev/*.tar.bz2 . && rm -rf $(cygwintmp)-dev
-