projects / oweals / cde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5823e95)
Get /usr/dt/config populated correctly on make install
authorJon Trulson <jon@radscan.com>
Mon, 2 Dec 2019 21:33:05 +0000 (14:33 -0700)
committerJon Trulson <jon@radscan.com>
Mon, 2 Dec 2019 21:33:05 +0000 (14:33 -0700)
cde/.gitignore patch | blob | history
cde/lib/DtHelp/Makefile.am patch | blob | history
cde/programs/dtimsstart/Makefile.am patch | blob | history
cde/programs/dtlogin/config/Makefile.am patch | blob | history
cde/programs/dtsearchpath/Makefile.am patch | blob | history
cde/programs/dtspcd/Makefile.am patch | blob | history
cde/programs/dtterm/Makefile.am patch | blob | history
cde/programs/localized/C/config/Makefile.am patch | blob | history
cde/programs/localized/templates/config.am patch | blob | history

diff --git a/cde/.gitignore b/cde/.gitignore
index 2ebe977e515ab120ec49d5f94c124d4c9066cb58..bf974323790d4ee656ef9d382dab308033bf443a 100644 (file)
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -2493,4 +2493,14 @@ lib/csa/y.tab.c
 lib/csa/y.tab.h
 util/tradcpp/tradcpp
 
+programs/dtlogin/config/sys.dtprofile
+programs/localized/C/config/0100.session
+programs/localized/C/config/0120.session
+programs/localized/C/config/0140.session
+programs/localized/C/config/0160.session
+programs/localized/de_DE.UTF-8/config/0100.session
+programs/localized/de_DE.UTF-8/config/0120.session
+programs/localized/de_DE.UTF-8/config/0140.session
+programs/localized/de_DE.UTF-8/config/0160.session
+
 
diff --git a/cde/lib/DtHelp/Makefile.am b/cde/lib/DtHelp/Makefile.am
index bb36499a6f3512afed40e2a5fe26ea600f09ee50..c89a20a39e7b19e4d5b3c6e300902b628cc3c1ac 100644 (file)
--- a/cde/lib/DtHelp/Makefile.am
+++ b/cde/lib/DtHelp/Makefile.am
@@ -2,6 +2,10 @@ MAINTAINERCLEANFILES = Makefile.in
 
 SUBDIRS = il
 
+cfgdir = $(CDE_INSTALLATION_TOP)/config/svc
+dist_cfg_DATA = CDE.lcx
+
+
 lib_LTLIBRARIES = libDtHelp.la
 
 libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
@@ -13,12 +17,7 @@ libDtHelp_la_LIBADD = -ljpeg il/libil.la
 
 if SOLARIS
 libDtHelp_la_CFLAGS += -DICONV_INBUF_CONST=const -DLSB_BIT_ORDER
-libDtHelp_la_LIBADD += -lw -lgen -lm -lc $(XTOOLLIB) ${X_LIBS}
-endif
-
-if AIX
-libDtHelp_la_CFLAGS += -DICONV_INBUF_CONST=const
-libDtHelp_la_LIBADD += $(XTOOLLIB) ${X_LIBS} -liconv
+libDtHelp_la_LIBADD += -lw -lgen -lm -lc
 endif
 
 if LINUX
@@ -27,12 +26,9 @@ endif
 
 if BSD
 libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER
-libDtHelp_la_LIBADD += -liconv $(XTOOLLIB) ${X_LIBS}
+libDtHelp_la_LIBADD += -liconv
 endif
 
-if HPUX
-libDtHelp_la_LIBADD += $(LIBSVC) -lXm -lm $(XTOOLLIB) ${X_LIBS}
-endif
 
 libDtHelp_la_SOURCES = Actions.c       AsciiSpc.c      Callbacks.c \
                       Destroy.c       Environ_c.c     FileListUtils.c \
diff --git a/cde/programs/dtimsstart/Makefile.am b/cde/programs/dtimsstart/Makefile.am
index ed234d03e6fd476ed2d9714b93d851b21bb3c2e3..c2d91440a0ea80ac4a7fb88d5700fcb5dd2afaba 100644 (file)
--- a/cde/programs/dtimsstart/Makefile.am
+++ b/cde/programs/dtimsstart/Makefile.am
@@ -21,6 +21,12 @@ dtimsstart_SOURCES = action.c env.c file.c main.c remote.c select.c  \
 BUILT_SOURCES = 0020.dtims
 CLEANFILE = $(BUILT_SOURCES)
 
+cfgdir = $(CDE_INSTALLATION_TOP)/config/Xsession.d
+dist_cfg_DATA = 0020.dtims
+
+imsdir = $(CDE_INSTALLATION_TOP)/config/ims
+dist_ims_DATA = conf/start.conf
+
 LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                    -DKORNSHELL=$(KSH)
diff --git a/cde/programs/dtlogin/config/Makefile.am b/cde/programs/dtlogin/config/Makefile.am
index 85c315e81def7adcb6aae38610049a9e3ea49659..465822559b00ecce9ed28515f391857e862f440c 100644 (file)
--- a/cde/programs/dtlogin/config/Makefile.am
+++ b/cde/programs/dtlogin/config/Makefile.am
@@ -8,23 +8,33 @@ if FREEBSD
 AM_CPPFLAGS += -DFREEBSD
 endif
 
-CPP_TARGETS = \
-       0060.dtsysenv           Dtlogin \
-       Xaccess                 Xconfig \
-       Xconfig.con             Xconfig.nc \
-       Xfailsafe               Xreset \
-       Xresources              Xresources.ive \
-       Xservers                Xservers.con \
-       Xservers.nc             Xsession \
-       Xsession.ive            Xsetup \
-       Xstartup                current.session \
-       display.current.session display.home.session \
-       dtlslocale              dtprofile \
-       home.session
+CPP_TARGETS = 0060.dtsysenv Dtlogin Xaccess Xconfig Xconfig.con        \
+       Xconfig.nc Xfailsafe Xreset Xresources Xresources.ive   \
+       Xservers Xservers.con Xservers.nc Xsession Xsession.ive \
+       Xsetup Xstartup current.session display.current.session \
+       display.home.session dtlslocale dtprofile home.session  \
+       sys.dtprofile
 
 BUILT_SOURCES = $(CPP_TARGETS)
 CLEANFILES = $(CPP_TARGETS)
 
+# Some of these are installed here, others are installed via
+# programs/localization/
+
+configsdir=$(CDE_INSTALLATION_TOP)/config
+dist_configs_DATA = Xaccess Xconfig Xfailsafe Xreset Xservers Xsetup \
+       Xstartup sys.dtprofile
+
+xsessdir=$(CDE_INSTALLATION_TOP)/config/Xsession.d
+dist_xsess_DATA = 0060.dtsysenv
+
+
+# fake - installed under a different name
+sys.dtprofile: dtprofile
+       $(RM) $@
+       $(LN_S) $< $@
+
+# regular targets
 0060.dtsysenv: 0060.dtsysenv.src
        $(RM) $@
        $(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS)  $< > $@
diff --git a/cde/programs/dtsearchpath/Makefile.am b/cde/programs/dtsearchpath/Makefile.am
index 7704c8a9bb8a203f57c161b62107bd2278d52408..34b7f116555b035031c990f0717d09c8cdf93494 100644 (file)
--- a/cde/programs/dtsearchpath/Makefile.am
+++ b/cde/programs/dtsearchpath/Makefile.am
@@ -5,6 +5,9 @@ SUBDIRS = libCliSrv dtsp dtappg
 BUILT_SOURCES = 0010.dtpaths 0030.dttmpdir
 CLEANFILES = $(BUILT_SOURCES)
 
+cfgdir = $(CDE_INSTALLATION_TOP)/config/Xsession.d
+dist_cfg_DATA = 0010.dtpaths 0030.dttmpdir
+
 LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP)     \
        -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)                \
        -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) -DKORNSHELL=$(KSH)
diff --git a/cde/programs/dtspcd/Makefile.am b/cde/programs/dtspcd/Makefile.am
index d054eae91d48fd617fd5597b721bac2539e6343e..c0b517af9a80d3b0aa036b3dcc51d082f46ea145 100644 (file)
--- a/cde/programs/dtspcd/Makefile.am
+++ b/cde/programs/dtspcd/Makefile.am
@@ -12,6 +12,9 @@ if SOLARIS
 dtspcd_LDADD += -ldl -lgen
 endif
 
+cfgdir = $(CDE_INSTALLATION_TOP)/config
+dist_cfg_DATA = dtspcdenv
+
 # I really think we should get rid of dtspcd in general...
 
 dtspcd_SOURCES = main.c spcd_event.c
diff --git a/cde/programs/dtterm/Makefile.am b/cde/programs/dtterm/Makefile.am
index fd290794d10e5da9853f1ee6680f54a2ec15f0d3..0a6d3449ba87df0f24bb73fb97e5e43cbcfdeb8e 100644 (file)
--- a/cde/programs/dtterm/Makefile.am
+++ b/cde/programs/dtterm/Makefile.am
@@ -24,6 +24,9 @@ CPP_TARGETS = dtterm.ti DtTermFallBackResources.c.src \
 BUILT_SOURCES = $(CPP_TARGETS)
 CLEANFILES = $(CPP_TARGETS)
 
+cfgdir = $(CDE_INSTALLATION_TOP)/config
+dist_cfg_DATA = dtterm.ti
+
 Dtterm.ad: Dtterm.ad.src
        $(RM) $@
        $(GENCPP) -P -DXCOMM=# $< > $@
diff --git a/cde/programs/localized/C/config/Makefile.am b/cde/programs/localized/C/config/Makefile.am
index d1c226a5968a7f3d0688e8d6a46c8588d6428412..3e4a3dd3f4aea7518de3d10eb43fed0801c4add4 100644 (file)
--- a/cde/programs/localized/C/config/Makefile.am
+++ b/cde/programs/localized/C/config/Makefile.am
@@ -3,3 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
 include ../../templates/C.am
 include ../../templates/config.am
 
+# Setup a symlink from C -> en_US.UTF-8
+install-data-hook:
+       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/config/en_US.UTF-8
+       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/config/ && $(LN_S) C en_US.UTF-8
+
diff --git a/cde/programs/localized/templates/config.am b/cde/programs/localized/templates/config.am
index 988b4101263b7686d4153c056c5476d873338d26..d13e19ba4f3ba806ee221cb54ba1afb3b9a6f015 100644 (file)
--- a/cde/programs/localized/templates/config.am
+++ b/cde/programs/localized/templates/config.am
@@ -6,7 +6,8 @@
 
 BUILT_SOURCES = sys.resources sys.session sys.font sys.dtwmrc  \
        Xresources dtfile.config home.session current.session   \
-       display.home.session display.current.session
+       display.home.session display.current.session 0100.session \
+       0120.session 0140.session 0160.session
 
 if SOLARIS
 BUILT_SOURCES += Xresources.ow
@@ -14,10 +15,37 @@ endif
 
 CLEANFILES = $(BUILT_SOURCES)
 
+cfgmaindir = $(CDE_INSTALLATION_TOP)/config/$(LANG)
+dist_cfgmain_DATA = dtfile.config sys.dtwmrc sys.resources Xresources  \
+       sys.font sys.session
+
+cfgrsrcdir = $(CDE_INSTALLATION_TOP)/config/$(LANG)/Xresources.d
+dist_cfgrsrc_DATA = 0100.session 0120.session 0140.session     \
+       0160.session
+
 TOP = $(top_builddir)/programs
 MERGE = $(top_builddir)/programs/localized/util/merge
 
+# these are the names these 4 file are really installed as, so create
+# symlinks to them for installation
+0100.session: current.session
+       $(RM) $@
+       $(LN_S) $< $@
+
+0120.session: home.session
+       $(RM) $@
+       $(LN_S) $< $@
+
+0140.session: display.current.session
+       $(RM) $@
+       $(LN_S) $< $@
+
+0160.session: display.home.session
+       $(RM) $@
+       $(LN_S) $< $@
+
 
+# these are the real targets
 sys.resources: $(TOP)/dtsession/sys.resources sys.resources.tmsg
        $(MERGE) -lang $(LANG) $@.tmsg < $< > $@ || $(RM) $@
 
Unnamed repository; edit this file 'description' to name the repository.