Attachment #16486 for bug #2391




/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT

/**/# For a generic Solaris 2.x system, I'd suggest
/**/#MORECCFLAGS=-I/usr/X11R6/include/X11 -I/usr/include/bsd -include /usr/include/bsd/bsd.h -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768 
MORECCFLAGS=-I/usr/X11R6/include/X11 -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768 

/**/#
/**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you

/**/#MORELDFLAGS=-L${OPENWINHOME}/lib
/**/#
/**/# For Solaris 2.x, I'd suggest
/**/MORELDFLAGS=-lbsd -lXpm
MORELDFLAGS=-lXpm


/**/# No more changes needed

	${HEADERS} ${BITMAPS} ${SRCS} \
	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}

LexFile(parse)

#if NeedMenuFile
InstallNonExecList($(MISC),$(LIBRARY_DEST))
#endif

parse.c: parse.l
	lex -t parse.l > parse.c

YaccFileNoFlags(olvwmrc)
	yacc olvwmrc.y
	mv y.tab.c olvwmrc.c

olvwmrc.o: parse.c olvwmrc.c

version.c: ${SRCS} ${HEADERS}
	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c

ComplexProgramTarget(olvwm)

#if NeedMenuFile
InstallNonExecList($(MISC),$(LIBRARY_DEST))
#endif

clean::
	/bin/rm -f parse.c olvwmrc.c version.c


Lines 255-261 Link Here

(-)olvwm4pl1-Linux.orig/olvwm.man (-1 / +1 lines)
255	.sp	255	.sp
256	Programs MENU	256	Programs MENU
257	Programs COLUMNS 2	257	Programs COLUMNS 2
258	</usr/openwin/include/X11/bitmaps/terminal> DEFAULT cmdtool	258	</usr/X11R6/include/X11/bitmaps/terminal> DEFAULT cmdtool
259	"Text Editor" textedit	259	"Text Editor" textedit
260	Mail mailtool	260	Mail mailtool
261	"File Manager" filemgr	261	"File Manager" filemgr

Lines 479-485 Link Here

(-)olvwm4pl1-Linux.orig/pixmap.c (-1 / +1 lines)
479	int i = 0;;	479	int i = 0;;
480		480
481	if ((owHome = getenv("OPENWINHOME")) == NULL)	481	if ((owHome = getenv("OPENWINHOME")) == NULL)
482	owHome = "/usr/openwin";	482	owHome = "/usr/X11R6";
483		483
484	bitmapSearchPath = (char *)MemAlloc(4 sizeof(char *));	484	bitmapSearchPath = (char *)MemAlloc(4 sizeof(char *));
485		485

Lines 536-542 Link Here

(-)olvwm4pl1-Linux.orig/screen.c (-1 / +1 lines)
536	int i = 0;;	536	int i = 0;;
537		537
538	if ((owHome = getenv("OPENWINHOME")) == NULL)	538	if ((owHome = getenv("OPENWINHOME")) == NULL)
539	owHome = "/usr/openwin";	539	owHome = "/usr/X11R6";
540		540
541	bitmapSearchPath = (char *)MemAlloc(4 sizeof(char *));	541	bitmapSearchPath = (char *)MemAlloc(4 sizeof(char *));
542		542

Lines 884-890 Link Here

(-)olvwm4pl1-Linux.orig/usermenu.c (-3 / +3 lines)
884	home = ".";	884	home = ".";
885		885
886	if ((owHome = getenv("OPENWINHOME")) == NULL)	886	if ((owHome = getenv("OPENWINHOME")) == NULL)
887	owHome = "/usr/openwin";	887	owHome = "/usr/X11R6";
888		888
889	menuSearchPath = (char *)MemAlloc(NUM_SEARCH_PATHsizeof(char *));	889	menuSearchPath = (char *)MemAlloc(NUM_SEARCH_PATHsizeof(char *));
890		890
Lines 914-921 Link Here
914	sprintf(buf, "%s/lib/%%s", owHome);	914	sprintf(buf, "%s/lib/%%s", owHome);
915	menuSearchPath[i++] = MemNewString(buf);	915	menuSearchPath[i++] = MemNewString(buf);
916		916
917	/* /usr/openwin/lib/<menufile> */	917	/* /usr/X11R6/lib/<menufile> */
918	menuSearchPath[i++] = MemNewString("/usr/openwin/lib/%s");	918	menuSearchPath[i++] = MemNewString("/usr/X11R6/lib/%s");
919		919
920	menuSearchPath[i] = (char *)NULL;	920	menuSearchPath[i] = (char *)NULL;
921		921

Return to bug 2391

Lines 48-54 Link Here

(-)olvwm4pl1-Linux.orig/Imakefile (-13 / +12 lines)
48	/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT	48	/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
49		49
50	/**/# For a generic Solaris 2.x system, I'd suggest	50	/**/# For a generic Solaris 2.x system, I'd suggest
51	MORECCFLAGS=-I/usr/X11R6/include/X11 -I/usr/include/bsd -include /usr/include/bsd/bsd.h -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768	51	/**/#MORECCFLAGS=-I/usr/X11R6/include/X11 -I/usr/include/bsd -include /usr/include/bsd/bsd.h -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768
		52	MORECCFLAGS=-I/usr/X11R6/include/X11 -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768
52		53
53	/**/#	54	/**/#
54	/**/# Set MORELDFLAGS to any link options you want. Be sure to add -lxpm if you	55	/**/# Set MORELDFLAGS to any link options you want. Be sure to add -lxpm if you
Lines 57-63 Link Here
57	/**/#MORELDFLAGS=-L${OPENWINHOME}/lib	58	/**/#MORELDFLAGS=-L${OPENWINHOME}/lib
58	/**/#	59	/**/#
59	/**/# For Solaris 2.x, I'd suggest	60	/**/# For Solaris 2.x, I'd suggest
60	MORELDFLAGS=-lbsd -lXpm	61	/**/MORELDFLAGS=-lbsd -lXpm
		62	MORELDFLAGS=-lXpm
61		63
62		64
63	/**/# No more changes needed	65	/**/# No more changes needed
Lines 115-138 Link Here
115	${HEADERS} ${BITMAPS} ${SRCS} \	117	${HEADERS} ${BITMAPS} ${SRCS} \
116	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}	118	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}
117		119
118	ComplexProgramTarget(olvwm)	120	LexFile(parse)
119
120	#if NeedMenuFile
121	InstallNonExecList($(MISC),$(LIBRARY_DEST))
122	#endif
123
124	parse.c: parse.l
125	lex -t parse.l > parse.c
126		121
127	olvwmrc.c: olvwmrc.y	122	YaccFileNoFlags(olvwmrc)
128	yacc olvwmrc.y
129	mv y.tab.c olvwmrc.c
130		123
131	olvwmrc.o: parse.c olvwmrc.c	124	olvwmrc.o: parse.c olvwmrc.c
132		125
133	version.c: ${SRCS} ${HEADERS}	126	version.c: ${SRCS} ${HEADERS}
134	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c	127	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c
135		128
		129	ComplexProgramTarget(olvwm)
		130
		131	#if NeedMenuFile
		132	InstallNonExecList($(MISC),$(LIBRARY_DEST))
		133	#endif
		134
136	clean::	135	clean::
137	/bin/rm -f parse.c olvwmrc.c version.c	136	/bin/rm -f parse.c olvwmrc.c version.c
138		137