From: Jon Trulson <jon@radscan.com>
Date: Thu, 21 Nov 2019 00:46:20 +0000 (-0700)
Subject: dtconfig: make it build
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=58505b904dbf630df30613a3d41e33e7d0b53bd5;p=oweals%2Fcde.git

dtconfig: make it build
---

diff --git a/cde/configure.ac b/cde/configure.ac
index 18a62189..7df921ab 100644
--- 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 5d86d482..9495f0c0 100644
--- 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 74a1b2ab..805e1ade 100644
--- 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