Attachment #78091 for bug #108261




 *	Where to install XView libraries
 */
#ifndef XVLibraryDestination
#define XVLibraryDestination $(XVDESTDIR)/%GENTOO_LIBDIR%
#endif
/*
 *	Where to install XView lint libraries
 */
#ifndef XVLintLibraryDestination
#define XVLintLibraryDestination $(XVDESTDIR)/%GENTOO_LIBDIR%/lint
#endif
/*
 *      Where to install the XView clients.  By default, the MIT configuration

Lines 118-124 Link Here

(-)config/XView.cf.orig (-1 / +1 lines)
118	* the appropriate value.	118	* the appropriate value.
119	*/	119	*/
120	#ifndef XVDestDir	120	#ifndef XVDestDir
121	#define XVDestDir /usr/X11R6	121	#define XVDestDir /usr
122	#endif	122	#endif
123	/*	123	/*
124	* Command to add object modules to the library.	124	* Command to add object modules to the library.





# Set the directories that will be used for installation
[ -z "$OPENWINHOME" ] && OPENWINHOME=/usr/openwin
[ -z "$X11DIR" ] && X11DIR=/usr
OWDEST=$DESTDIR$OPENWINHOME
X11DEST=$DESTDIR$X11DIR/%GENTOO_LIBDIR%/X11/config

# Generate file that gets appended to every Makefile created by the imake-wrapper

# BUILDPREFIX can be used to compile with shared libraries not installed in
# the standard locations
if [ -n "$BUILDPREFIX" ]; then
  IMAKE_EXTRA_INCLUDES="-I$BUILDPREFIX/usr/include -I$BUILDPREFIX/usr/include -I$BUILDPREFIX/include/X11"
  IMAKE_EXTRA_LOCAL_LDFLAGS="-L$BUILDPREFIX/usr/%GENTOO_LIBDIR% -L$BUILDPREFIX/usr/%GENTOO_LIBDIR% -L$BUILDPREFIX/%GENTOO_LIBDIR%"
fi
cat > imake.append <<EOF


  EXTRA_DEFINES  = -DOPENWINHOME_DEFAULT=\"$OPENWINHOME\"
  CONFIGDIR      = $X11DEST
  INCLUDES      := -I`pwd`/build/include $IMAKE_EXTRA_INCLUDES -I$OWDEST/include \$(INCLUDES)
  LOCAL_LDFLAGS := -L`pwd`/lib/libolgx -L`pwd`/lib/libxview $IMAKE_EXTRA_LOCAL_LDFLAGS -L$OWDEST/%GENTOO_LIBDIR% \$(LOCAL_LDFLAGS)
  MAKEOVERRIDES  =
# End of variable-definitions appended by imake-wrapper

EOF

IMAKEAPPEND="`pwd`/imake.append"
IMAKEINCLUDE="-I`pwd`/config -I$BUILDPREFIX/usr/%GENTOO_LIBDIR%/X11/config -I$BUILDPREFIX/%GENTOO_LIBDIR%/X11/config -I/usr/%GENTOO_LIBDIR%/X11/config"

# Make sure our wrappers are in the path
if [ -z "$XVIEW_SETUP" ]; then

      ) || exit $?
      ;;
    instfinish)
      [ -e $OWDEST/%GENTOO_LIBDIR%/openwin-menu-std ] || mv $OWDEST/%GENTOO_LIBDIR%/openwin-menu $OWDEST/%GENTOO_LIBDIR%/openwin-menu-std
      install -d $OWDEST/lib/xview $OWDEST/share/locale/C/props
      install -m 644 contrib/misc/openwin-menu* $OWDEST/%GENTOO_LIBDIR%
      install -m 755 contrib/misc/Xinitrc $OWDEST/%GENTOO_LIBDIR%
      install -m 755 contrib/misc/{openwin,owplaces} $OWDEST/bin
      install -m 644 contrib/misc/props-locale.C $OWDEST/share/locale/C/props/C
      install -m 644 contrib/misc/props-locale.basic_setting $OWDEST/share/locale/C/props/basic_setting

    tar)
      DIRNAME="`pwd`"
      DIRNAME="${DIRNAME##*/}"
      ( cd $DESTDIR/ && tar cv ${OPENWINHOME##/} ${X11DIR##/}/%GENTOO_LIBDIR%/X11/config/XView.* ) | \
        gzip -9 > ../$DIRNAME.bin.tar.gz
      ;;
    srctar)

Return to bug 108261

Lines 23-35 Link Here

(-)config/XView.tmpl.orig (-2 / +2 lines)
23	* Where to install XView libraries	23	* Where to install XView libraries
24	*/	24	*/
25	#ifndef XVLibraryDestination	25	#ifndef XVLibraryDestination
26	#define XVLibraryDestination $(XVDESTDIR)/lib	26	#define XVLibraryDestination $(XVDESTDIR)/%GENTOO_LIBDIR%
27	#endif	27	#endif
28	/*	28	/*
29	* Where to install XView lint libraries	29	* Where to install XView lint libraries
30	*/	30	*/
31	#ifndef XVLintLibraryDestination	31	#ifndef XVLintLibraryDestination
32	#define XVLintLibraryDestination $(XVDESTDIR)/lib/lint	32	#define XVLintLibraryDestination $(XVDESTDIR)/%GENTOO_LIBDIR%/lint
33	#endif	33	#endif
34	/*	34	/*
35	* Where to install the XView clients. By default, the MIT configuration	35	* Where to install the XView clients. By default, the MIT configuration

Lines 18-34 Link Here

(-)Build-LinuxXView.bash.orig (-10 / +10 lines)
18		18
19	# Set the directories that will be used for installation	19	# Set the directories that will be used for installation
20	[ -z "$OPENWINHOME" ] && OPENWINHOME=/usr/openwin	20	[ -z "$OPENWINHOME" ] && OPENWINHOME=/usr/openwin
21	[ -z "$X11DIR" ] && X11DIR=/usr/X11R6	21	[ -z "$X11DIR" ] && X11DIR=/usr
22	OWDEST=$DESTDIR$OPENWINHOME	22	OWDEST=$DESTDIR$OPENWINHOME
23	X11DEST=$DESTDIR$X11DIR/lib/X11/config	23	X11DEST=$DESTDIR$X11DIR/%GENTOO_LIBDIR%/X11/config
24		24
25	# Generate file that gets appended to every Makefile created by the imake-wrapper	25	# Generate file that gets appended to every Makefile created by the imake-wrapper
26		26
27	# BUILDPREFIX can be used to compile with shared libraries not installed in	27	# BUILDPREFIX can be used to compile with shared libraries not installed in
28	# the standard locations	28	# the standard locations
29	if [ -n "$BUILDPREFIX" ]; then	29	if [ -n "$BUILDPREFIX" ]; then
30	IMAKE_EXTRA_INCLUDES="-I$BUILDPREFIX/usr/X11R6/include -I$BUILDPREFIX/usr/include -I$BUILDPREFIX/include/X11"	30	IMAKE_EXTRA_INCLUDES="-I$BUILDPREFIX/usr/include -I$BUILDPREFIX/usr/include -I$BUILDPREFIX/include/X11"
31	IMAKE_EXTRA_LOCAL_LDFLAGS="-L$BUILDPREFIX/usr/X11R6/lib -L$BUILDPREFIX/usr/lib -L$BUILDPREFIX/lib"	31	IMAKE_EXTRA_LOCAL_LDFLAGS="-L$BUILDPREFIX/usr/%GENTOO_LIBDIR% -L$BUILDPREFIX/usr/%GENTOO_LIBDIR% -L$BUILDPREFIX/%GENTOO_LIBDIR%"
32	fi	32	fi
33	cat > imake.append <<EOF	33	cat > imake.append <<EOF
34		34
Lines 37-50 Link Here
37	EXTRA_DEFINES = -DOPENWINHOME_DEFAULT=\"$OPENWINHOME\"	37	EXTRA_DEFINES = -DOPENWINHOME_DEFAULT=\"$OPENWINHOME\"
38	CONFIGDIR = $X11DEST	38	CONFIGDIR = $X11DEST
39	INCLUDES := -I`pwd`/build/include $IMAKE_EXTRA_INCLUDES -I$OWDEST/include \$(INCLUDES)	39	INCLUDES := -I`pwd`/build/include $IMAKE_EXTRA_INCLUDES -I$OWDEST/include \$(INCLUDES)
40	LOCAL_LDFLAGS := -L`pwd`/lib/libolgx -L`pwd`/lib/libxview $IMAKE_EXTRA_LOCAL_LDFLAGS -L$OWDEST/lib \$(LOCAL_LDFLAGS)	40	LOCAL_LDFLAGS := -L`pwd`/lib/libolgx -L`pwd`/lib/libxview $IMAKE_EXTRA_LOCAL_LDFLAGS -L$OWDEST/%GENTOO_LIBDIR% \$(LOCAL_LDFLAGS)
41	MAKEOVERRIDES =	41	MAKEOVERRIDES =
42	# End of variable-definitions appended by imake-wrapper	42	# End of variable-definitions appended by imake-wrapper
43		43
44	EOF	44	EOF
45		45
46	IMAKEAPPEND="`pwd`/imake.append"	46	IMAKEAPPEND="`pwd`/imake.append"
47	IMAKEINCLUDE="-I`pwd`/config -I$BUILDPREFIX/usr/X11R6/lib/X11/config -I$BUILDPREFIX/lib/X11/config -I/usr/X11R6/lib/X11/config"	47	IMAKEINCLUDE="-I`pwd`/config -I$BUILDPREFIX/usr/%GENTOO_LIBDIR%/X11/config -I$BUILDPREFIX/%GENTOO_LIBDIR%/X11/config -I/usr/%GENTOO_LIBDIR%/X11/config"
48		48
49	# Make sure our wrappers are in the path	49	# Make sure our wrappers are in the path
50	if [ -z "$XVIEW_SETUP" ]; then	50	if [ -z "$XVIEW_SETUP" ]; then
Lines 110-119 Link Here
110	) \|\| exit $?	110	) \|\| exit $?
111	;;	111	;;
112	instfinish)	112	instfinish)
113	[ -e $OWDEST/lib/openwin-menu-std ] \|\| mv $OWDEST/lib/openwin-menu $OWDEST/lib/openwin-menu-std	113	[ -e $OWDEST/%GENTOO_LIBDIR%/openwin-menu-std ] \|\| mv $OWDEST/%GENTOO_LIBDIR%/openwin-menu $OWDEST/%GENTOO_LIBDIR%/openwin-menu-std
114	install -d $OWDEST/lib/xview $OWDEST/share/locale/C/props	114	install -d $OWDEST/lib/xview $OWDEST/share/locale/C/props
115	install -m 644 contrib/misc/openwin-menu* $OWDEST/lib	115	install -m 644 contrib/misc/openwin-menu* $OWDEST/%GENTOO_LIBDIR%
116	install -m 755 contrib/misc/Xinitrc $OWDEST/lib	116	install -m 755 contrib/misc/Xinitrc $OWDEST/%GENTOO_LIBDIR%
117	install -m 755 contrib/misc/{openwin,owplaces} $OWDEST/bin	117	install -m 755 contrib/misc/{openwin,owplaces} $OWDEST/bin
118	install -m 644 contrib/misc/props-locale.C $OWDEST/share/locale/C/props/C	118	install -m 644 contrib/misc/props-locale.C $OWDEST/share/locale/C/props/C
119	install -m 644 contrib/misc/props-locale.basic_setting $OWDEST/share/locale/C/props/basic_setting	119	install -m 644 contrib/misc/props-locale.basic_setting $OWDEST/share/locale/C/props/basic_setting
Lines 127-133 Link Here
127	tar)	127	tar)
128	DIRNAME="`pwd`"	128	DIRNAME="`pwd`"
129	DIRNAME="${DIRNAME##*/}"	129	DIRNAME="${DIRNAME##*/}"
130	( cd $DESTDIR/ && tar cv ${OPENWINHOME##/} ${X11DIR##/}/lib/X11/config/XView.* ) \| \	130	( cd $DESTDIR/ && tar cv ${OPENWINHOME##/} ${X11DIR##/}/%GENTOO_LIBDIR%/X11/config/XView.* ) \| \
131	gzip -9 > ../$DIRNAME.bin.tar.gz	131	gzip -9 > ../$DIRNAME.bin.tar.gz
132	;;	132	;;
133	srctar)	133	srctar)