On Wed, 22 Aug 2012, Marcin Cieslak wrote:

> After cleaning ".depend" files (necessary because I have 
> linked motif includes differently) I am getting
> various build failures:

(...)

Seems like I was working a lot in the unclean environment
- some required dtlogin files were present, although
we don't attempt to build dtlogin yet.

Two patches attached seem to solve this and now it is
possible to build a FreeBSD branch (git clone 
http://sourceforge.net/u/saperski/cde-freebsd/)
in a clean environment.

Those patches should not yet go into a mainline,
do you think that turning off SGML guides 
could become a global parameter in the Imakefiles?
(right now I put the ugly !defined(FreeBSDArchitecture))

//Marcin


>From 450e55ef919115f1b107a38a2149f109eef86539 Mon Sep 17 00:00:00 2001
From: Marcin Cieslak <sa...@saper.info>
Date: Wed, 22 Aug 2012 17:40:48 +0200
Subject: [PATCH 1/2] Don't build guides for FreeBSD yet

---
 cde/doc/common/help/Imakefile.tmpl |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/cde/doc/common/help/Imakefile.tmpl 
b/cde/doc/common/help/Imakefile.tmpl
index 6099e4f..f3e245c 100644
--- a/cde/doc/common/help/Imakefile.tmpl
+++ b/cde/doc/common/help/Imakefile.tmpl
@@ -6,6 +6,7 @@ XCOMM $XConsortium: Imakefile.tmpl /main/8 1996/10/30 18:57:11 
rws $
  * macros to be defined in the local Imakefile. 
  */
 
+#if !defined(FreeBSDArchitecture)
 SDLDIR = ../help-sdl
 #if UseNSGMLS
 DBENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.."
@@ -183,3 +184,4 @@ TEXTEDIT_SRCS = \
 
 MakeSdlVolume(Textedit,$(SDLDIR),$(DBENV),$(DBOPTS),$(TEXTEDIT_SRCS))
 #endif
+#endif
-- 
1.7.9.2



>From fa18301621c9420b8c6ca620b69b1014e4cd915b Mon Sep 17 00:00:00 2001
From: Marcin Cieslak <sa...@saper.info>
Date: Wed, 22 Aug 2012 17:41:06 +0200
Subject: [PATCH 2/2] Build dtlogin/config even without dtlogin

dtlogin/config generates useful shell scripts
as well as resource files

We have some trouble building the CDE on FreeBSD
if those are not included.
---
 cde/programs/Imakefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index 64cd36c..f278e37 100644
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -23,7 +23,7 @@ DTLOGIN = dtlogin
 DTKSHDIR = dtksh
 DTINFODIR = 
 DTCMDIR =
-DTLOGINDIR =
+DTLOGINDIR = dtlogin/config
 #else
 DTKSHDIR = dtksh
 DTINFODIR = dtinfo
-- 
1.7.9.2


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Reply via email to