dtappintegrate: make it build

diff --git a/cde/configure.ac b/cde/configure.ac
index a50f36914e9324c027985384e9c497026a7ae05c..b0316fe9b51141b87e2e13b2bfca234803dfe99a 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -420,6 +420,8 @@ programs/dtsearchpath/libCliSrv/Makefile
 programs/dtsearchpath/dtsp/Makefile
 programs/dtsearchpath/dtappg/Makefile
 
+programs/dtappintegrate/Makefile
+
 ])
 
 AC_OUTPUT

diff --git a/cde/programs/dtappintegrate/Makefile.am b/cde/programs/dtappintegrate/Makefile.am
index a0a636b701eb7eb81a962137866c5916e546c3dd..0947e142c7e615d55f9bad7d17a3104169d886da 100644 (file)
--- a/cde/programs/dtappintegrate/Makefile.am
+++ b/cde/programs/dtappintegrate/Makefile.am
@@ -1,13 +1,15 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-bin_PROGRAMS = dtappintegrate
+bin_SCRIPTS = dtappintegrate
+BUILT_SOURCES = $(bin_SCRIPTS)
+CLEANFILES = $(bin_SCRIPTS)
 
-dtappintegrate_CPPFLAGS = -DKORNSHELL=$(KSH)
-                         -DCDE_INSTALLATION_TOP=${prefix} \
-                         -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
+LOCAL_CPP_DEFINES = -DKORNSHELL=$(KSH)                 \
+       -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP)  \
+       -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
 
-all: dtappintegrate
+dtappintegrate: dtappintegrate.src
+       $(RM) $@
+       $(GENCPP) -P -DXCOMM=# -DSTAR='*' $(LOCAL_CPP_DEFINES) $< > $@
+       chmod 755 $@
 
-CPPSRC = dtappintegrate.src
-CPPTARGET = dtappintegrate
-include $(srcdir)/include/cppfile.src

diff --git a/cde/programs/dtappintegrate/dtappintegrate.src b/cde/programs/dtappintegrate/dtappintegrate.src
index 62ee9f9a1cc988161ae2ed0ea17053a2876e776f..4404caa9c41b0a23362f35b18ab12f7fc41915f0 100755 (executable)
--- a/cde/programs/dtappintegrate/dtappintegrate.src
+++ b/cde/programs/dtappintegrate/dtappintegrate.src
@@ -1,6 +1,5 @@
 XCOMM!KORNSHELL
 XCOMM $XConsortium: dtappintegrate.src /main/4 1996/04/21 19:27:37 drk $
-#define COMMENT_STAR *
 XCOMM ###################################################################
 XCOMM                                                                   #
 XCOMM  dtappintegrate                                                   #
@@ -153,9 +152,9 @@ function LinkCfgs
   do
     if [[ $pattern = "(*)" ]]
       then
-      files=$(ls -d "$source"/COMMENT_STAR 2>/dev/null)
+      files=$(ls -d "$source/"STAR 2>/dev/null)
     else
-      files=$(ls -d "$source"/"$pattern" 2>/dev/null)
+      files=$(ls -d "$source/$pattern" 2>/dev/null)
     fi
     if $files
       then
@@ -480,4 +479,5 @@ fi
 XCOMM -------------------------------------------------------------------
 XCOMM  Exit
 XCOMM -------------------------------------------------------------------
+
 ExitOut 0