diff -r -u src/icewm-1.0.8.orig/Makefile src/icewm-1.0.8/Makefile
--- src/icewm-1.0.8.orig/Makefile	Fri Apr 27 17:50:36 2001
+++ src/icewm-1.0.8/Makefile	Thu Jul 19 12:01:58 2001
@@ -98,9 +98,8 @@
 		    $(INSTALLLIB) "$$fontfile" $(LIBDIR)/themes/$$theme; \
 		done; \
 		if test -x "$(MKFONTDIR)"; then \
-		  pushd "$(LIBDIR)/themes/$$theme"; \
-		  $(MKFONTDIR); \
-		  popd; \
+		  (cd "$(LIBDIR)/themes/$$theme"; \
+		  $(MKFONTDIR);) \
 		else \
 		  echo "WARNING: A dummy file has been copied to"; \
 		  echo "         $(LIBDIR)/themes/$$theme/fonts.dir"; \
@@ -127,7 +126,9 @@
 	@$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
 	@echo Installing documentation in $(DOCDIR); \
 	cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \
-	cp -r doc/*.{sgml,html} $(DOCDIR)/icewm-$(VERSION)
+	cp -r doc/*.sgml $(DOCDIR)/icewm-$(VERSION); \
+        cp -r doc/*.html $(DOCDIR)/icewm-$(VERSION)
+
 
 install-nls: nls
 	@echo ------------------------------------------
diff -r -u src/icewm-1.0.8.orig/Makefile.in src/icewm-1.0.8/Makefile.in
--- src/icewm-1.0.8.orig/Makefile.in	Thu Apr 26 20:32:21 2001
+++ src/icewm-1.0.8/Makefile.in	Thu Jul 19 12:02:11 2001
@@ -97,9 +97,8 @@
 		    $(INSTALLLIB) "$$fontfile" $(LIBDIR)/themes/$$theme; \
 		done; \
 		if test -x "$(MKFONTDIR)"; then \
-		  pushd "$(LIBDIR)/themes/$$theme"; \
-		  $(MKFONTDIR); \
-		  popd; \
+		  (cd "$(LIBDIR)/themes/$$theme"; \
+		  $(MKFONTDIR);) \
 		else \
 		  echo "WARNING: A dummy file has been copied to"; \
 		  echo "         $(LIBDIR)/themes/$$theme/fonts.dir"; \
@@ -126,7 +125,9 @@
 	@$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
 	@echo Installing documentation in $(DOCDIR); \
 	cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \
-	cp -r doc/*.{sgml,html} $(DOCDIR)/icewm-$(VERSION)
+	cp -r doc/*.sgml $(DOCDIR)/icewm-$(VERSION); \
+        cp -r doc/*.html $(DOCDIR)/icewm-$(VERSION)
+
 
 install-nls: nls
 	@echo ------------------------------------------
diff -r -u src/icewm-1.0.8.orig/src/Makefile src/icewm-1.0.8/src/Makefile
--- src/icewm-1.0.8.orig/src/Makefile	Thu Apr 26 20:32:22 2001
+++ src/icewm-1.0.8/src/Makefile	Tue Aug 28 17:44:10 2001
@@ -17,10 +17,9 @@
 	-DHOSTOS='"$(shell uname -s || echo unknown)"' \
 	-DHOSTCPU='"$(shell uname -m || echo unknown)"' \
 	-DEXEEXT='"$(EXEEXT)"' \
-	-DICEWMEXE='"icewm"EXEEXT' \
 	-DICEHELPEXE='"icehelp"EXEEXT' \
 	-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' \
-        $(SYS_CFLAGS) $(SYS_INCDIRS)
+        $(SYS_CFLAGS) $(SYS_INCDIRS) $(ICEWMEXEVARIANT)
 LFLAGS = $(SYS_LIBDIRS) 
 LIBS = $(SYS_LIBS)
 
diff -r -u src/icewm-1.0.8.orig/src/yapp.cc src/icewm-1.0.8/src/yapp.cc
--- src/icewm-1.0.8.orig/src/yapp.cc	Thu Apr 26 20:32:22 2001
+++ src/icewm-1.0.8/src/yapp.cc	Mon Aug 27 17:26:50 2001
@@ -592,9 +592,9 @@
 }
 
 bool YApplication::hasColormap() {
-    if (DefaultVisual(display(), DefaultScreen(display()))->c_class & 1 )
+    /* if (DefaultVisual(display(), DefaultScreen(display()))->c_class & 1 ) */
         return true;
-    return false;
+    /* return false; */
 }
 
 void YApplication::registerTimer(YTimer *t) {