dtconfig: make it build

diff --git a/cde/configure.ac b/cde/configure.ac
index 18a62189190792c65965898e41822ef28c00d996..7df921ab387aaacd1087f83175250e20f101d823 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -424,6 +424,9 @@ programs/dtappintegrate/Makefile
 
 programs/dtprintegrate/Makefile
 
+programs/dtconfig/Makefile
+programs/dtconfig/sun/Makefile
+
 ])
 
 AC_OUTPUT

diff --git a/cde/programs/dtconfig/Makefile.am b/cde/programs/dtconfig/Makefile.am
index 5d86d4826f9a40d5e5b972ef11c283c04865b3a2..9495f0c04aacc3337688fb47b3c27dfd9a605d11 100644 (file)
--- a/cde/programs/dtconfig/Makefile.am
+++ b/cde/programs/dtconfig/Makefile.am
@@ -4,10 +4,3 @@ if SOLARIS
 SUBDIRS = sun
 endif
 
-if AIX
-SUBDIRS = ibm
-endif
-
-if HPUX
-SUBDIRS = hp
-endif

diff --git a/cde/programs/dtconfig/sun/Makefile.am b/cde/programs/dtconfig/sun/Makefile.am
index 74a1b2abc2235b534f441e07ca4ed345fa20e44a..805e1adee533cc486e7fdbe3d1876f8541acb50d 100644 (file)
--- a/cde/programs/dtconfig/sun/Makefile.am
+++ b/cde/programs/dtconfig/sun/Makefile.am
@@ -1,16 +1,23 @@
-configdir = ${prefix}/config
+MAINTAINERCLEANFILES = Makefile.in
 
 dist_bin_SCRIPTS = dtconfig
 
+configdir = $(CDE_INSTALLATION_TOP)/config
 dist_config_DATA = dtlogin.rc dtlogin.xml
 
-SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=${prefix} \
+SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
               -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
 
-CPPTARGET = dtconfig
-CPPSRC = dtconfig.src
-include $(srcdir)/include/cppfile.tmpl
+BUILT_SOURCES = dtconfig dtlogin.rc
+CLEANFILES = $(BUILT_SOURCES)
+
+dtconfig: dtconfig.src
+       $(RM) $@
+       $(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+       chmod 755 $@
+
+dtlogin.rc: dtlogin.rc.src
+       $(RM) $@
+       $(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+       chmod 755 $@
 
-CPPTARGET = dtlogin.rc
-CPPSRC = dtlogin.rc.src
-include $(srcdir)/include/cppfile.tmpl