--- Imakefile.orig	Sun Jun 26 03:47:22 1994
+++ Imakefile	Sun May 23 14:16:14 2010
@@ -1,8 +1,8 @@
 #include <XView.tmpl>
 
-/**/#########################################################################
-/**/# Top level Imakefile for ProductNameAndRelease
-/**/# @(#)Imakefile	1.7 1/7/92 SMI
+XCOMM ########################################################################
+XCOMM  Top level Imakefile for ProductNameAndRelease
+XCOMM  @(#)Imakefile	1.7 1/7/92 SMI
 
 CC = cc
 CFLAGS = -O 
@@ -11,8 +11,8 @@ CFLAGS = -O 
 #define PassCDebugFlags
 
            WORLDOPTS = 
-/**/# If you want to make only the library, then start the build in the lib
-/**/# subdirectory.  Be sure to do a 'make includes' in images and bitmaps first.
+XCOMM  If you want to make only the library, then start the build in the lib
+XCOMM  subdirectory.  Be sure to do a 'make includes' in images and bitmaps first.
             COREDIRS = lib images bitmaps misc util
 #if InstallOpenLookFonts 
             FONTSDIR = fonts
@@ -20,14 +20,14 @@ CFLAGS = -O 
             FONTSDIR = 
 #endif
           CLIENTSDIR = clients
-             SUBDIRS = $(COREDIRS) $(FONTSDIR) 
-/**/# even if these subdirs are not included in the general rules, be sure to
-/**/# do a make clean in them.
+             SUBDIRS ?= $(COREDIRS) $(FONTSDIR) 
+XCOMM  even if these subdirs are not included in the general rules, be sure to
+XCOMM  do a make clean in them.
        CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util
 
-/**/#
-/**/# Be sure to run "make includes" before "make depend" or "make"
-/**/#
+XCOMM 
+XCOMM  Be sure to run "make includes" before "make depend" or "make"
+XCOMM 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 PopulateSubdirs($(SUBDIRS))
@@ -36,14 +36,14 @@ MakeLintSubdirs(lib,install.ln,install.ln)
 InstallSrcsSubdirs($(SUBDIRS))
 
 #ifdef XVDestDir
-/**/# remove all the symlinks before installing the real files if using the
-/**/# same directory for the includes as for the final install.
+XCOMM  remove all the symlinks before installing the real files if using the
+XCOMM  same directory for the includes as for the final install.
 install::
 	-@if [ $(BUILDINCDIR) = $(XVDESTDIR) ]; then \
 		echo "deleting temporary build directory $(BUILDINCDIR) ..."; \
 		$(RM) -r $(BUILDINCDIR); \
 	else exit 0; fi
-	$(MKDIRHIER) $(XVDESTDIR)
+	$(MKDIRHIER) $(DESTDIR)$(XVDESTDIR)
 #endif
 
 InstallManPage(xview,$(MANDIR))
@@ -84,9 +84,9 @@ World::
 #endif
 	@echo ""
 
-/**/#
-/**/# Rules to build the client programs
-/**/# 
+XCOMM 
+XCOMM  Rules to build the client programs
+XCOMM  
 Clients::
 	@echo ""
 	@echo "Begin build of XView client programs..."
@@ -126,9 +126,9 @@ Clients::
 	@echo ""
 #endif
 
-/**/#
-/**/# Rules to build contrib
-/**/# 
+XCOMM 
+XCOMM  Rules to build contrib
+XCOMM  
 Contrib::
 	@echo ""
 	@echo "Begin build of XView contrib programs..."
@@ -148,9 +148,9 @@ Contrib::
 	@echo "Examples will be installed into $(XVDESTDIR)/
 	@echo ""
 
-/**/#
-/**/# Rule to clean all subdirs
-/**/#
+XCOMM 
+XCOMM  Rule to clean all subdirs
+XCOMM 
 Clean::
 	@echo ""
 	@echo "Cleaning for all subdirs..."