external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Apply various patches from Giacomo Comes <comes@naic.edu>

Browse source 
This makes certain changes if you are bold enough to use a different
installation prefix than /usr/dt:

- fix MANDIR output from dtsearchpath
- missing dtopn_* links
- /usr/dt/bin is always needed
- fix DTKORNSHELL output for dtlp
This commit is contained in:
Jon Trulson 2023-02-04 13:03:49 -07:00
parent 8dff0e37b7
commit 02b4302a73
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cde/doc/Makefile.am
View file

@ -21,3 +21,7 @@ endif
if JAPANESE if JAPANESE
SUBDIRS += ja_JP.UTF-8 SUBDIRS += ja_JP.UTF-8
endif endif
install-data-hook:
$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/man
cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/ && $(LN_S) $(mandir) man

4
cde/programs/Makefile.am
View file

@ -7,3 +7,7 @@ SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin \
dtcreate dtprintinfo fontaliases dtdspmsg ttsnoop dtimsstart \ dtcreate dtprintinfo fontaliases dtdspmsg ttsnoop dtimsstart \
dtpdm dtsr dtpdmd dtinfo types tttypes util dtopen localized \ dtpdm dtsr dtpdmd dtinfo types tttypes util dtopen localized \
dthelp dtdocbook dthelp dtdocbook
install-data-hook:
-if [ $(CDE_INSTALLATION_TOP)/bin != $(bindir) ];then \
cd $(DESTDIR)$(CDE_INSTALLATION_TOP) && $(LN_S) $(bindir) bin ; fi

10
cde/programs/dtopen/Makefile.am
View file

@ -14,8 +14,8 @@ dtopen: dtopen.src
$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@ $(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
install-data-hook: install-data-hook:
$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtopen_* $(RM) $(DESTDIR)$(bindir)/dtopen_*
cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_video cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_video
cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_image cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_image
cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_ps cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_ps
cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_pdf cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_pdf

2
cde/programs/dtprintegrate/Makefile.am
View file

@ -4,7 +4,7 @@ bin_SCRIPTS = dtprintegrate dtlp dtlpsetup
LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \ LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \ -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-DDTKORNSHELL="$(CDE_INSTALLATION_TOP)/bin/dtksh" \ -DDTKORNSHELL="$(bindir)/dtksh" \
-DKORNSHELL=$(KSH) -DKORNSHELL=$(KSH)
BUILT_SOURCES = dtprintegrate dtlp dtlpsetup BUILT_SOURCES = dtprintegrate dtlp dtlpsetup