diff --git a/cde/configure.ac b/cde/configure.ac index a50f36914..b0316fe9b 100644 --- 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 a0a636b70..0947e142c 100644 --- 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 62ee9f9a1..4404caa9c 100755 --- 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