Attachment #43367 for bug #67359

View | Details | Raw Unified | Return to bug 67359
Collapse All | Expand All

Lines 7-14 Link Here

(-)x11-toolkits/xbae/Makefile (-2 / +3 lines)
7	# $FreeBSD: ports/x11-toolkits/xbae/Makefile,v 1.24 2004/03/14 06:17:53 ade Exp $	7	# $FreeBSD: ports/x11-toolkits/xbae/Makefile,v 1.24 2004/03/14 06:17:53 ade Exp $
8	#	8	#
9		9
10	PORTNAME= xbae	10	PORTNAME= Xbae
11	PORTVERSION= 4.50.0	11	PORTVERSION= 4.50.91
12	CATEGORIES= x11-toolkits math	12	CATEGORIES= x11-toolkits math
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= xbae	14	MASTER_SITE_SUBDIR= xbae
Lines 19-24 Link Here
19		19
20	USE_LIBTOOL_VER=13	20	USE_LIBTOOL_VER=13
21	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
		22	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
22		23
23	USE_MOTIF= yes	24	USE_MOTIF= yes
24	USE_X_PREFIX= yes	25	USE_X_PREFIX= yes

Lines 1-2 Link Here

(-)x11-toolkits/xbae/distinfo (-2 / +2 lines)
1	MD5 (Xbae-4.50.0.tar.gz) = 8233877eae34f114f6f05590543af4ad	1	MD5 (Xbae-4.50.91.tar.gz) = 7580353e86ca452b481608b67586fc3c
2	SIZE (Xbae-4.50.0.tar.gz) = 1270772	2	SIZE (Xbae-4.50.91.tar.gz) = 1413828




lib/libXbae.la
lib/libXbae.so
lib/libXbae.so.4
%%DOCSDIR%%/FAQ.html
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/README
%%DOCSDIR%%/contents.html
%%DOCSDIR%%/coverplus.html
%%DOCSDIR%%/difffonts.html
%%DOCSDIR%%/images/LDO.jpg
%%DOCSDIR%%/images/add.jpg
%%DOCSDIR%%/images/bg.png
%%DOCSDIR%%/images/capfloor1.png
%%DOCSDIR%%/images/capfloor3.png
%%DOCSDIR%%/images/caption.png
%%DOCSDIR%%/images/choice.png
%%DOCSDIR%%/images/colors.jpg
%%DOCSDIR%%/images/coverplus.png
%%DOCSDIR%%/images/draw.png
%%DOCSDIR%%/images/fifteen.jpg
%%DOCSDIR%%/images/input.png
%%DOCSDIR%%/images/lesstif.png
%%DOCSDIR%%/images/list.jpg
%%DOCSDIR%%/images/mailbox.png
%%DOCSDIR%%/images/matrix.jpg
%%DOCSDIR%%/images/multifixed.jpg
%%DOCSDIR%%/images/new.png
%%DOCSDIR%%/images/organize.jpg
%%DOCSDIR%%/images/pricing.jpg
%%DOCSDIR%%/images/risk.jpg
%%DOCSDIR%%/images/select-push.jpg
%%DOCSDIR%%/images/taam.png
%%DOCSDIR%%/images/updated.png
%%DOCSDIR%%/images/xbasket.png
%%DOCSDIR%%/images/xbill2-2.png
%%DOCSDIR%%/images/xbum1-2.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/main.html
%%DOCSDIR%%/morelines.html
%%DOCSDIR%%/psdriver.html
%%DOCSDIR%%/scrolling.html
%%DOCSDIR%%/sites.html
%%DOCSDIR%%/spancells.html
%%DOCSDIR%%/title.html
%%DOCSDIR%%/users.html
%%EXAMPLESDIR%%/builderXcessory/XbaeCaption.col
%%EXAMPLESDIR%%/builderXcessory/XbaeCaption.pix
%%EXAMPLESDIR%%/builderXcessory/XbaeInput.col
%%EXAMPLESDIR%%/builderXcessory/XbaeInput.pix
%%EXAMPLESDIR%%/builderXcessory/XbaeMatrix.col
%%EXAMPLESDIR%%/builderXcessory/XbaeMatrix.pix
%%EXAMPLESDIR%%/builderXcessory/local.cat
%%EXAMPLESDIR%%/builderXcessory/xbae.wml
%%EXAMPLESDIR%%/builderXcessory/xbae_ctrl.tcl
@dirrm share/doc/Xbae/images
@dirrm share/doc/Xbae
@dirrm share/examples/Xbae/builderXcessory
@dirrm share/examples/Xbae
@dirrm share/Xbae
@dirrm include/Xbae




diff -bru acconfig.h acconfig.h
--- acconfig.h	Thu Aug 16 12:35:43 2001
+++ acconfig.h	Sat Nov 23 15:52:20 2002
@@ -6,3 +6,6 @@
 #undef HAVE_LIB_XP
 
 #undef HAVE_MOTIF
+
+/* Build a production version of the library */
+#undef XBAE_PRODUCTION
diff -bru configure configure
--- configure	Wed Oct 16 13:56:36 2002
+++ configure	Sat Nov 23 15:52:48 2002
@@ -1002,6 +1002,7 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer
+  --enable-production     build a production version
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4694,7 +4695,7 @@
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4697 "configure"' > conftest.$ac_ext
+  echo '#line 4698 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5230,7 +5231,7 @@
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -7023,7 +7024,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7026 "configure"
+#line 7027 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7121,7 +7122,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7124 "configure"
+#line 7125 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9611,6 +9612,19 @@
 echo "$as_me:$LINENO: result: libraries $motif_libraries_result, headers $motif_includes_result" >&5
 echo "${ECHO_T}libraries $motif_libraries_result, headers $motif_includes_result" >&6
 
+
+# Check whether --enable-production or --disable-production was given.
+if test "${enable_production+set}" = set; then
+  enableval="$enable_production"
+
+fi;
+
+if test "x$enable_production" = "xyes" ; then
+	cat >>confdefs.h <<\_ACEOF
+#define XBAE_PRODUCTION 1
+_ACEOF
+
+fi
 
 if (aclocal --print-ac-dir) </dev/null >/dev/null 2>&1 && test -w `aclocal --print-ac-dir`; then
     ACLOCALDIR=`aclocal --print-ac-dir`
diff -bru configure.in configure.in
--- configure.in	Wed Oct 16 13:44:30 2002
+++ configure.in	Sat Nov 23 15:52:20 2002
@@ -98,6 +98,20 @@
 dnl
 AC_FIND_MOTIF
 
+dnl
+dnl Build a production version of the library
+dnl This will compile out XdbDebug statements
+dnl (the libraries itself remain binary compatible, you can
+dnl  link against a debug version, run with a production version 
+dnl  and vice versa!)
+dnl
+AC_ARG_ENABLE(production,
+[  --enable-production     build a production version])
+
+if test "x$enable_production" = "xyes" ; then
+	AC_DEFINE(XBAE_PRODUCTION)
+fi
+
 dnl Run test in a subshell; some versions of sh will print an error if
 dnl an executable is not found, even if stderr is redirected.
 dnl Redirect stdin to placate older versions of autoconf.  Sigh.
diff -bru include/XbaeDebug.h include/XbaeDebug.h
--- include/XbaeDebug.h	Sat Apr  6 10:01:19 2002
+++ include/XbaeDebug.h	Sat Nov 23 15:52:20 2002
@@ -136,7 +136,7 @@
 void _XbaeDebugAction(const char *fn, Widget w, const String action,
 		const String *params, const Cardinal *num_params);
 
-#ifdef LESSTIF_PRODUCTION
+#ifdef XBAE_PRODUCTION
 #define	_XbaeDebugInDebug(x, y)	False
 #define DEBUGOUT(x)
 
@@ -146,7 +146,7 @@
 #else
 Boolean _XbaeDebugInDebug(const char *fn, Widget w);
 #define DEBUGOUT(x)	x
-#endif /* LESSTIF_PRODUCTION */
+#endif /* XBAE_PRODUCTION */
 
 /*
  * Some stuff to produce sensible tracing with dmalloc.
diff -bru src/DebugUtil.c src/DebugUtil.c
--- src/DebugUtil.c	Thu Jul 25 16:37:10 2002
+++ src/DebugUtil.c	Sat Nov 23 15:52:20 2002
@@ -77,7 +77,7 @@
 Boolean _XbaeDebugInDebug(const char *fn, Widget w);
 
 
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
 /* All external interfaces need to be in place for both, 
    debug and production build. We may just reduce them
    to empty stubs ... */
@@ -130,16 +130,16 @@
  *      enabled or disabled upon program start. Valid Values are on/off.
  *      e.g. XBAE_DEBUG_TOGGLE=off
  *
- * If the C macro LESSTIF_PRODUCTION is defined, then _XbaeDebug etc. don't
+ * If the C macro XBAE_PRODUCTION is defined, then _XbaeDebug etc. don't
  *      work. Note: this is a compile time option.
  * To have maximum performance, sequences of _XbaeDebug statements should be
  *      surrounded by an if (_XbaeDebugInDebug(__FILE__, w)) statement.
- *      _XbaeDebugInDebug is False when LESSTIF_PRODUCTION is defined.
+ *      _XbaeDebugInDebug is False when XBAE_PRODUCTION is defined.
  */
 
 
 
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
 static Boolean _XbaeDebugFlag = True;
 static FILE *_XbaeDebugFile = NULL;
 typedef void (*sighandler_t)(int);
@@ -638,7 +638,7 @@
 
 
 
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
 /* catches the signal defined by XBAE_DEBUG_SIGNAL and toggles the
    global debugging flag.
    Avoid calling C-runtime functions from within here if possible 
@@ -719,7 +719,7 @@
          return True;
     } /* signo != NOSIG */
 }		/* siginstall() */
-#endif /* LESSTIF_PRODUCTION */
+#endif /* XBAE_PRODUCTION */
 
 
 /* some initialization.
@@ -727,7 +727,7 @@
    is en- or disabled currently */
 extern Boolean
 _XbaeDebugInit(void) {
-#ifdef LESSTIF_PRODUCTION
+#ifdef XBAE_PRODUCTION
     return False;
 #else
     static Boolean init=False;
@@ -751,7 +751,7 @@
 #endif
 }
 
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
 static void 
 _XbaeDebugOpenFile(void)
 {
@@ -1009,13 +1009,13 @@
       }
 } /* ValidateSource() */
 
-#endif /* !LESSTIF_PRODUCTION */
+#endif /* !XBAE_PRODUCTION */
 
 
 extern void 
 _XbaeDebug(const char *fn, Widget w, const char *fmt, ...)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
     va_list ap;
 
 #ifdef DEBUGVALIDATE
@@ -1049,14 +1049,14 @@
 
 	fflush(_XbaeDebugFile);
     }
-#endif /* !LESSTIF_PRODUCTION */
+#endif /* !XBAE_PRODUCTION */
 }
 
 
 extern void 
 _XbaeDebug2(const char *fn, Widget w, Widget c, const char *fmt, ...)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
     va_list ap;
 
     if (_XbaeDebugInit() && ValidateSource(fn))
@@ -1100,14 +1100,14 @@
 	vfprintf(_XbaeDebugFile, fmt, ap);
 	va_end(ap);
     }
-#endif /* !LESSTIF_PRODUCTION */
+#endif /* !XBAE_PRODUCTION */
 }
 
 
 extern void 
 _XbaeDebug0(const char *fn, Widget w, const char *fmt, ...)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
     va_list ap;
     
     if (_XbaeDebugInit() && ValidateSource(fn))
@@ -1116,7 +1116,7 @@
 	vfprintf(_XbaeDebugFile, fmt, ap);
 	va_end(ap);
     }
-#endif /* !LESSTIF_PRODUCTION */
+#endif /* !XBAE_PRODUCTION */
 }
 
 
@@ -1125,7 +1125,7 @@
 extern Boolean 
 _XbaeDebugInDebug(const char *fn, Widget w)
 {
-#ifdef LESSTIF_PRODUCTION
+#ifdef XBAE_PRODUCTION
     return False;
 #else
     return ValidateSource(fn);
@@ -1165,7 +1165,7 @@
 extern void
 _XbaeDebugSet(Boolean flag)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
   if (flag)
      _XbaeDebugFlag = True;
   else
@@ -1180,7 +1180,7 @@
 extern void
 _XbaeDebugToggle(void)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
    _XbaeDebugFlag = !_XbaeDebugFlag;
 #endif
 }
@@ -1190,7 +1190,7 @@
 extern Boolean
 _XbaeDebugQueryState(void)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
   return _XbaeDebugFlag;
 #else
   return False;
@@ -1198,7 +1198,7 @@
 }
 
 
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
 static Boolean
 __XbaeDebugPrintWidgetID(void)
 {
@@ -1263,7 +1263,7 @@
 extern void 
 _XbaeDebugPrintTree(Widget w)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
     __XbaeDebugPrintTree(w, 0);
 #endif
 }
@@ -1272,7 +1272,7 @@
 extern void 
 _XbaeDebugPrintCompleteTree(Widget w)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
     Widget ww = w;
 
     while (ww)
@@ -1303,7 +1303,7 @@
 extern void
 _XbaeDebugPrintArgList(const char *fn, Widget w, ArgList al, int n, Boolean Get)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
     int i;
     unsigned num;
 
@@ -1483,7 +1483,7 @@
 	    }
 	}
     }
-#endif/* !LESSTIF_PRODUCTION */
+#endif/* !XBAE_PRODUCTION */
 }
 
 
@@ -1493,7 +1493,7 @@
 extern void
 _XbaeDebugPrintString(const char *s)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
     _XbaeDebugOpenFile();
     fprintf(_XbaeDebugFile, "%s", s);
 #endif
@@ -2382,7 +2382,7 @@
 _XbaeDebugAction(const char *fn, Widget w, const String action,
 		const String *params, const Cardinal *num_params)
 {
-#ifndef LESSTIF_PRODUCTION
+#ifndef XBAE_PRODUCTION
 
 	if (_XbaeDebugInit() && ValidateSource(fn)) {
   		int	i;
@@ -2411,7 +2411,7 @@
 
 		fflush(_XbaeDebugFile);
 	}
-#endif /* !LESSTIF_PRODUCTION */
+#endif /* !XBAE_PRODUCTION */
 }
 
 /*




--- doc/Makefile.am.orig	Sat May 29 23:24:50 2004
+++ doc/Makefile.am	Sat May 29 23:24:57 2004
@@ -15,7 +15,7 @@
 # Lets put the informational stuff in a sub directory to avoid 
 # polluting /usr/local for default installs.
 #
-docdir=	$(datadir)/Xbae
+docdir=	$(datadir)/doc/Xbae
 
 doc_DATA=	\
       contents.html coverplus.html difffonts.html \
--- doc/Makefile.in.orig	Sat May 29 23:25:16 2004
+++ doc/Makefile.in	Sat May 29 23:25:18 2004
@@ -214,7 +214,7 @@
 # Lets put the informational stuff in a sub directory to avoid 
 # polluting /usr/local for default installs.
 #
-docdir = $(datadir)/Xbae
+docdir = $(datadir)/doc/Xbae
 
 doc_DATA = \
       contents.html coverplus.html difffonts.html \
       index.html main.html morelines.html \
--- Makefile.am.orig	Tue Aug 20 12:03:13 2002
+++ Makefile.am	Sat Nov 23 16:28:21 2002
@@ -16,7 +16,7 @@

 endif
 
-docdir=	$(prefix)/Xbae
+docdir=	$(datadir)/doc/Xbae
 doc_DATA= NEWS README
 
 .PHONY: changelog UpdateCheck
--- Makefile.in.orig	Sat May 29 22:51:17 2004
+++ Makefile.in	Sat May 29 23:03:58 2004
@@ -226,7 +226,7 @@
 
 aclocaldir = @ACLOCALDIR@
 @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
 
-docdir = $(prefix)/Xbae
+docdir = $(datadir)/doc/Xbae
 doc_DATA = NEWS README
 
 #
@@ -627,7 +627,7 @@
 
 info-am:
 
-install-data-am: install-aclocalDATA install-docDATA
+install-data-am: install-docDATA
 
 install-exec-am:
 
--- examples/builderXcessory/Makefile.am.orig	Sat May 29 23:20:22 2004
+++ examples/builderXcessory/Makefile.am	Sat May 29 23:20:26 2004
@@ -9,7 +9,7 @@
 	xbae.wml \
 	xbae_ctrl.tcl
 
-examplesdir = $(datadir)/Xbae/examples/builderXcessory
+examplesdir = $(datadir)/examples/Xbae/builderXcessory
 examples_DATA = \
 	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
 	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
--- examples/builderXcessory/Makefile.in.orig	Sat May 29 23:23:48 2004
+++ examples/builderXcessory/Makefile.in	Sat May 29 23:23:52 2004
@@ -203,7 +203,7 @@
 	xbae.wml \
 	xbae_ctrl.tcl
 
-examplesdir = $(datadir)/Xbae/examples/builderXcessory
+examplesdir = $(datadir)/examples/Xbae/builderXcessory
+examplesdir = $(datadir)/Xbae/examples/builderXcessory
 examples_DATA = \
 	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
 	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
--- src/Makefile.in.orig	Sat May 29 23:37:07 2004
+++ src/Makefile.in	Sat May 29 23:37:10 2004
@@ -525,7 +525,7 @@
 
 info-am:
 
-install-data-am: install-htmlDATA install-man
+install-data-am: install-man
 
 install-exec-am: install-libLTLIBRARIES
 
--- doc/images/Makefile.am.orig	Sat May 29 23:25:49 2004
+++ doc/images/Makefile.am	Sat May 29 23:25:53 2004
@@ -10,7 +10,7 @@
 # Lets put the informational stuff in a sub directory to avoid 
 # polluting /usr/local for default installs.
 #
-imagedir=	$(datadir)/Xbae/images
+imagedir=	$(datadir)/doc/Xbae/images
 
 
 
--- doc/images/Makefile.in.orig	Sat May 29 23:26:09 2004
+++ doc/images/Makefile.in	Sat May 29 23:26:14 2004
@@ -203,7 +203,7 @@
 # Lets put the informational stuff in a sub directory to avoid 
 # polluting /usr/local for default installs.
 #
-imagedir = $(datadir)/Xbae/images
+imagedir = $(datadir)/doc/Xbae/images
 
 #
 # Cut the distribution size, don't distribute these in a source

Return to bug 67359

Lines 10-69 Link Here

(-)x11-toolkits/xbae/pkg-plist (-56 / +55 lines)
10	lib/libXbae.la	10	lib/libXbae.la
11	lib/libXbae.so	11	lib/libXbae.so
12	lib/libXbae.so.4	12	lib/libXbae.so.4
13	share/Xbae/FAQ.html	13	%%DOCSDIR%%/FAQ.html
14	share/Xbae/INSTALL	14	%%DOCSDIR%%/NEWS
15	share/Xbae/NEWS	15	%%DOCSDIR%%/README
16	share/Xbae/README	16	%%DOCSDIR%%/contents.html
17	share/Xbae/contents.html	17	%%DOCSDIR%%/coverplus.html
18	share/Xbae/coverplus.html	18	%%DOCSDIR%%/difffonts.html
19	share/Xbae/difffonts.html	19	%%DOCSDIR%%/images/LDO.jpg
20	share/Xbae/examples/builderXcessory/XbaeCaption.col	20	%%DOCSDIR%%/images/add.jpg
21	share/Xbae/examples/builderXcessory/XbaeCaption.pix	21	%%DOCSDIR%%/images/bg.png
22	share/Xbae/examples/builderXcessory/XbaeInput.col	22	%%DOCSDIR%%/images/capfloor1.png
23	share/Xbae/examples/builderXcessory/XbaeInput.pix	23	%%DOCSDIR%%/images/capfloor3.png
24	share/Xbae/examples/builderXcessory/XbaeMatrix.col	24	%%DOCSDIR%%/images/caption.png
25	share/Xbae/examples/builderXcessory/XbaeMatrix.pix	25	%%DOCSDIR%%/images/choice.png
26	share/Xbae/examples/builderXcessory/local.cat	26	%%DOCSDIR%%/images/colors.jpg
27	share/Xbae/examples/builderXcessory/xbae.wml	27	%%DOCSDIR%%/images/coverplus.png
28	share/Xbae/examples/builderXcessory/xbae_ctrl.tcl	28	%%DOCSDIR%%/images/draw.png
29	share/Xbae/images/LDO.jpg	29	%%DOCSDIR%%/images/fifteen.jpg
30	share/Xbae/images/add.jpg	30	%%DOCSDIR%%/images/input.png
31	share/Xbae/images/bg.png	31	%%DOCSDIR%%/images/lesstif.png
32	share/Xbae/images/capfloor1.png	32	%%DOCSDIR%%/images/list.jpg
33	share/Xbae/images/capfloor3.png	33	%%DOCSDIR%%/images/mailbox.png
34	share/Xbae/images/caption.png	34	%%DOCSDIR%%/images/matrix.jpg
35	share/Xbae/images/choice.png	35	%%DOCSDIR%%/images/multifixed.jpg
36	share/Xbae/images/colors.jpg	36	%%DOCSDIR%%/images/new.png
37	share/Xbae/images/coverplus.png	37	%%DOCSDIR%%/images/organize.jpg
38	share/Xbae/images/draw.png	38	%%DOCSDIR%%/images/pricing.jpg
39	share/Xbae/images/fifteen.jpg	39	%%DOCSDIR%%/images/risk.jpg
40	share/Xbae/images/input.png	40	%%DOCSDIR%%/images/select-push.jpg
41	share/Xbae/images/lesstif.png	41	%%DOCSDIR%%/images/taam.png
42	share/Xbae/images/list.jpg	42	%%DOCSDIR%%/images/updated.png
43	share/Xbae/images/mailbox.png	43	%%DOCSDIR%%/images/xbasket.png
44	share/Xbae/images/matrix.jpg	44	%%DOCSDIR%%/images/xbill2-2.png
45	share/Xbae/images/multifixed.jpg	45	%%DOCSDIR%%/images/xbum1-2.png
46	share/Xbae/images/new.png	46	%%DOCSDIR%%/index.html
47	share/Xbae/images/organize.jpg	47	%%DOCSDIR%%/main.html
48	share/Xbae/images/pricing.jpg	48	%%DOCSDIR%%/morelines.html
49	share/Xbae/images/risk.jpg	49	%%DOCSDIR%%/psdriver.html
50	share/Xbae/images/select-push.jpg	50	%%DOCSDIR%%/scrolling.html
51	share/Xbae/images/taam.png	51	%%DOCSDIR%%/sites.html
52	share/Xbae/images/updated.png	52	%%DOCSDIR%%/spancells.html
53	share/Xbae/images/xbasket.png	53	%%DOCSDIR%%/title.html
54	share/Xbae/images/xbill2-2.png	54	%%DOCSDIR%%/users.html
55	share/Xbae/images/xbum1-2.png	55	%%EXAMPLESDIR%%/builderXcessory/XbaeCaption.col
56	share/Xbae/index.html	56	%%EXAMPLESDIR%%/builderXcessory/XbaeCaption.pix
57	share/Xbae/main.html	57	%%EXAMPLESDIR%%/builderXcessory/XbaeInput.col
58	share/Xbae/morelines.html	58	%%EXAMPLESDIR%%/builderXcessory/XbaeInput.pix
59	share/Xbae/psdriver.html	59	%%EXAMPLESDIR%%/builderXcessory/XbaeMatrix.col
60	share/Xbae/scrolling.html	60	%%EXAMPLESDIR%%/builderXcessory/XbaeMatrix.pix
61	share/Xbae/sites.html	61	%%EXAMPLESDIR%%/builderXcessory/local.cat
62	share/Xbae/spancells.html	62	%%EXAMPLESDIR%%/builderXcessory/xbae.wml
63	share/Xbae/title.html	63	%%EXAMPLESDIR%%/builderXcessory/xbae_ctrl.tcl
64	share/Xbae/users.html	64	@dirrm share/doc/Xbae/images
65	@dirrm share/Xbae/images	65	@dirrm share/doc/Xbae
66	@dirrm share/Xbae/examples/builderXcessory	66	@dirrm share/examples/Xbae/builderXcessory
67	@dirrm share/Xbae/examples	67	@dirrm share/examples/Xbae
68	@dirrm share/Xbae
69	@dirrm include/Xbae	68	@dirrm include/Xbae

Removed Link Here

(-)x11-toolkits/xbae/files/patch-ab (-357 lines)
1	diff -bru acconfig.h acconfig.h
2	--- acconfig.h Thu Aug 16 12:35:43 2001
3	+++ acconfig.h Sat Nov 23 15:52:20 2002
4	@@ -6,3 +6,6 @@
5	#undef HAVE_LIB_XP
6
7	#undef HAVE_MOTIF
8	+
9	+/* Build a production version of the library */
10	+#undef XBAE_PRODUCTION
11	diff -bru configure configure
12	--- configure Wed Oct 16 13:56:36 2002
13	+++ configure Sat Nov 23 15:52:48 2002
14	@@ -1002,6 +1002,7 @@
15	--disable-libtool-lock avoid locking (might break parallel builds)
16	--enable-maintainer-mode enable make rules and dependencies not useful
17	(and sometimes confusing) to the casual installer
18	+ --enable-production build a production version
19
20	Optional Packages:
21	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
22	@@ -4694,7 +4695,7 @@
23	case $host in
24	--irix6*)
25	# Find out which ABI we are using.
26	- echo '#line 4697 "configure"' > conftest.$ac_ext
27	+ echo '#line 4698 "configure"' > conftest.$ac_ext
28	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
29	(eval $ac_compile) 2>&5
30	ac_status=$?
31	@@ -5230,7 +5231,7 @@
32	save_CFLAGS="$CFLAGS"
33	CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
34	compiler_c_o=no
35	-if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
36	+if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
37	# The compiler can only warn and ignore the option if not recognized
38	# So say no if there are warnings
39	if test -s out/conftest.err; then
40	@@ -7023,7 +7024,7 @@
41	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
42	lt_status=$lt_dlunknown
43	cat > conftest.$ac_ext <<EOF
44	-#line 7026 "configure"
45	+#line 7027 "configure"
46	#include "confdefs.h"
47
48	#if HAVE_DLFCN_H
49	@@ -7121,7 +7122,7 @@
50	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
51	lt_status=$lt_dlunknown
52	cat > conftest.$ac_ext <<EOF
53	-#line 7124 "configure"
54	+#line 7125 "configure"
55	#include "confdefs.h"
56
57	#if HAVE_DLFCN_H
58	@@ -9611,6 +9612,19 @@
59	echo "$as_me:$LINENO: result: libraries $motif_libraries_result, headers $motif_includes_result" >&5
60	echo "${ECHO_T}libraries $motif_libraries_result, headers $motif_includes_result" >&6
61
62	+
63	+# Check whether --enable-production or --disable-production was given.
64	+if test "${enable_production+set}" = set; then
65	+ enableval="$enable_production"
66	+
67	+fi;
68	+
69	+if test "x$enable_production" = "xyes" ; then
70	+ cat >>confdefs.h <<\_ACEOF
71	+#define XBAE_PRODUCTION 1
72	+_ACEOF
73	+
74	+fi
75
76	if (aclocal --print-ac-dir) </dev/null >/dev/null 2>&1 && test -w `aclocal --print-ac-dir`; then
77	ACLOCALDIR=`aclocal --print-ac-dir`
78	diff -bru configure.in configure.in
79	--- configure.in Wed Oct 16 13:44:30 2002
80	+++ configure.in Sat Nov 23 15:52:20 2002
81	@@ -98,6 +98,20 @@
82	dnl
83	AC_FIND_MOTIF
84
85	+dnl
86	+dnl Build a production version of the library
87	+dnl This will compile out XdbDebug statements
88	+dnl (the libraries itself remain binary compatible, you can
89	+dnl link against a debug version, run with a production version
90	+dnl and vice versa!)
91	+dnl
92	+AC_ARG_ENABLE(production,
93	+[ --enable-production build a production version])
94	+
95	+if test "x$enable_production" = "xyes" ; then
96	+ AC_DEFINE(XBAE_PRODUCTION)
97	+fi
98	+
99	dnl Run test in a subshell; some versions of sh will print an error if
100	dnl an executable is not found, even if stderr is redirected.
101	dnl Redirect stdin to placate older versions of autoconf. Sigh.
102	diff -bru include/XbaeDebug.h include/XbaeDebug.h
103	--- include/XbaeDebug.h Sat Apr 6 10:01:19 2002
104	+++ include/XbaeDebug.h Sat Nov 23 15:52:20 2002
105	@@ -136,7 +136,7 @@
106	void _XbaeDebugAction(const char *fn, Widget w, const String action,
107	const String params, const Cardinal num_params);
108
109	-#ifdef LESSTIF_PRODUCTION
110	+#ifdef XBAE_PRODUCTION
111	#define _XbaeDebugInDebug(x, y) False
112	#define DEBUGOUT(x)
113
114	@@ -146,7 +146,7 @@
115	#else
116	Boolean _XbaeDebugInDebug(const char *fn, Widget w);
117	#define DEBUGOUT(x) x
118	-#endif /* LESSTIF_PRODUCTION */
119	+#endif /* XBAE_PRODUCTION */
120
121	/*
122	* Some stuff to produce sensible tracing with dmalloc.
123	diff -bru src/DebugUtil.c src/DebugUtil.c
124	--- src/DebugUtil.c Thu Jul 25 16:37:10 2002
125	+++ src/DebugUtil.c Sat Nov 23 15:52:20 2002
126	@@ -77,7 +77,7 @@
127	Boolean _XbaeDebugInDebug(const char *fn, Widget w);
128
129
130	-#ifndef LESSTIF_PRODUCTION
131	+#ifndef XBAE_PRODUCTION
132	/* All external interfaces need to be in place for both,
133	debug and production build. We may just reduce them
134	to empty stubs ... */
135	@@ -130,16 +130,16 @@
136	* enabled or disabled upon program start. Valid Values are on/off.
137	* e.g. XBAE_DEBUG_TOGGLE=off
138	*
139	- * If the C macro LESSTIF_PRODUCTION is defined, then _XbaeDebug etc. don't
140	+ * If the C macro XBAE_PRODUCTION is defined, then _XbaeDebug etc. don't
141	* work. Note: this is a compile time option.
142	* To have maximum performance, sequences of _XbaeDebug statements should be
143	* surrounded by an if (_XbaeDebugInDebug(__FILE__, w)) statement.
144	- * _XbaeDebugInDebug is False when LESSTIF_PRODUCTION is defined.
145	+ * _XbaeDebugInDebug is False when XBAE_PRODUCTION is defined.
146	*/
147
148
149
150	-#ifndef LESSTIF_PRODUCTION
151	+#ifndef XBAE_PRODUCTION
152	static Boolean _XbaeDebugFlag = True;
153	static FILE *_XbaeDebugFile = NULL;
154	typedef void (*sighandler_t)(int);
155	@@ -638,7 +638,7 @@
156
157
158
159	-#ifndef LESSTIF_PRODUCTION
160	+#ifndef XBAE_PRODUCTION
161	/* catches the signal defined by XBAE_DEBUG_SIGNAL and toggles the
162	global debugging flag.
163	Avoid calling C-runtime functions from within here if possible
164	@@ -719,7 +719,7 @@
165	return True;
166	} /* signo != NOSIG */
167	} /* siginstall() */
168	-#endif /* LESSTIF_PRODUCTION */
169	+#endif /* XBAE_PRODUCTION */
170
171
172	/* some initialization.
173	@@ -727,7 +727,7 @@
174	is en- or disabled currently */
175	extern Boolean
176	_XbaeDebugInit(void) {
177	-#ifdef LESSTIF_PRODUCTION
178	+#ifdef XBAE_PRODUCTION
179	return False;
180	#else
181	static Boolean init=False;
182	@@ -751,7 +751,7 @@
183	#endif
184	}
185
186	-#ifndef LESSTIF_PRODUCTION
187	+#ifndef XBAE_PRODUCTION
188	static void
189	_XbaeDebugOpenFile(void)
190	{
191	@@ -1009,13 +1009,13 @@
192	}
193	} /* ValidateSource() */
194
195	-#endif /* !LESSTIF_PRODUCTION */
196	+#endif /* !XBAE_PRODUCTION */
197
198
199	extern void
200	_XbaeDebug(const char fn, Widget w, const char fmt, ...)
201	{
202	-#ifndef LESSTIF_PRODUCTION
203	+#ifndef XBAE_PRODUCTION
204	va_list ap;
205
206	#ifdef DEBUGVALIDATE
207	@@ -1049,14 +1049,14 @@
208
209	fflush(_XbaeDebugFile);
210	}
211	-#endif /* !LESSTIF_PRODUCTION */
212	+#endif /* !XBAE_PRODUCTION */
213	}
214
215
216	extern void
217	_XbaeDebug2(const char fn, Widget w, Widget c, const char fmt, ...)
218	{
219	-#ifndef LESSTIF_PRODUCTION
220	+#ifndef XBAE_PRODUCTION
221	va_list ap;
222
223	if (_XbaeDebugInit() && ValidateSource(fn))
224	@@ -1100,14 +1100,14 @@
225	vfprintf(_XbaeDebugFile, fmt, ap);
226	va_end(ap);
227	}
228	-#endif /* !LESSTIF_PRODUCTION */
229	+#endif /* !XBAE_PRODUCTION */
230	}
231
232
233	extern void
234	_XbaeDebug0(const char fn, Widget w, const char fmt, ...)
235	{
236	-#ifndef LESSTIF_PRODUCTION
237	+#ifndef XBAE_PRODUCTION
238	va_list ap;
239
240	if (_XbaeDebugInit() && ValidateSource(fn))
241	@@ -1116,7 +1116,7 @@
242	vfprintf(_XbaeDebugFile, fmt, ap);
243	va_end(ap);
244	}
245	-#endif /* !LESSTIF_PRODUCTION */
246	+#endif /* !XBAE_PRODUCTION */
247	}
248
249
250	@@ -1125,7 +1125,7 @@
251	extern Boolean
252	_XbaeDebugInDebug(const char *fn, Widget w)
253	{
254	-#ifdef LESSTIF_PRODUCTION
255	+#ifdef XBAE_PRODUCTION
256	return False;
257	#else
258	return ValidateSource(fn);
259	@@ -1165,7 +1165,7 @@
260	extern void
261	_XbaeDebugSet(Boolean flag)
262	{
263	-#ifndef LESSTIF_PRODUCTION
264	+#ifndef XBAE_PRODUCTION
265	if (flag)
266	_XbaeDebugFlag = True;
267	else
268	@@ -1180,7 +1180,7 @@
269	extern void
270	_XbaeDebugToggle(void)
271	{
272	-#ifndef LESSTIF_PRODUCTION
273	+#ifndef XBAE_PRODUCTION
274	_XbaeDebugFlag = !_XbaeDebugFlag;
275	#endif
276	}
277	@@ -1190,7 +1190,7 @@
278	extern Boolean
279	_XbaeDebugQueryState(void)
280	{
281	-#ifndef LESSTIF_PRODUCTION
282	+#ifndef XBAE_PRODUCTION
283	return _XbaeDebugFlag;
284	#else
285	return False;
286	@@ -1198,7 +1198,7 @@
287	}
288
289
290	-#ifndef LESSTIF_PRODUCTION
291	+#ifndef XBAE_PRODUCTION
292	static Boolean
293	__XbaeDebugPrintWidgetID(void)
294	{
295	@@ -1263,7 +1263,7 @@
296	extern void
297	_XbaeDebugPrintTree(Widget w)
298	{
299	-#ifndef LESSTIF_PRODUCTION
300	+#ifndef XBAE_PRODUCTION
301	__XbaeDebugPrintTree(w, 0);
302	#endif
303	}
304	@@ -1272,7 +1272,7 @@
305	extern void
306	_XbaeDebugPrintCompleteTree(Widget w)
307	{
308	-#ifndef LESSTIF_PRODUCTION
309	+#ifndef XBAE_PRODUCTION
310	Widget ww = w;
311
312	while (ww)
313	@@ -1303,7 +1303,7 @@
314	extern void
315	_XbaeDebugPrintArgList(const char *fn, Widget w, ArgList al, int n, Boolean Get)
316	{
317	-#ifndef LESSTIF_PRODUCTION
318	+#ifndef XBAE_PRODUCTION
319	int i;
320	unsigned num;
321
322	@@ -1483,7 +1483,7 @@
323	}
324	}
325	}
326	-#endif/* !LESSTIF_PRODUCTION */
327	+#endif/* !XBAE_PRODUCTION */
328	}
329
330
331	@@ -1493,7 +1493,7 @@
332	extern void
333	_XbaeDebugPrintString(const char *s)
334	{
335	-#ifndef LESSTIF_PRODUCTION
336	+#ifndef XBAE_PRODUCTION
337	_XbaeDebugOpenFile();
338	fprintf(_XbaeDebugFile, "%s", s);
339	#endif
340	@@ -2382,7 +2382,7 @@
341	_XbaeDebugAction(const char *fn, Widget w, const String action,
342	const String params, const Cardinal num_params)
343	{
344	-#ifndef LESSTIF_PRODUCTION
345	+#ifndef XBAE_PRODUCTION
346
347	if (_XbaeDebugInit() && ValidateSource(fn)) {
348	int i;
349	@@ -2411,7 +2411,7 @@
350
351	fflush(_XbaeDebugFile);
352	}
353	-#endif /* !LESSTIF_PRODUCTION */
354	+#endif /* !XBAE_PRODUCTION */
355	}
356
357	/*

Lines 1-25 Link Here

(-)x11-toolkits/xbae/files/patch-ac (-37 / +57 lines)
1	--- doc/Makefile.am.orig Sun Oct 6 13:19:58 2002	1	--- doc/Makefile.am.orig Sat May 29 23:24:50 2004
2	+++ doc/Makefile.am Sat Nov 23 16:20:46 2002	2	+++ doc/Makefile.am Sat May 29 23:24:57 2004
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4	# Lets put the informational stuff in a sub directory to avoid	4	# Lets put the informational stuff in a sub directory to avoid
5	# polluting /usr/local for default installs.	5	# polluting /usr/local for default installs.
6	#	6	#
7	-docdir= $(prefix)/Xbae	7	-docdir= $(datadir)/Xbae
8	+docdir= $(datadir)/Xbae	8	+docdir= $(datadir)/doc/Xbae
9		9
10	doc_DATA= \	10	doc_DATA= \
11	contents.html coverplus.html difffonts.html \	11	contents.html coverplus.html difffonts.html \
12	--- doc/Makefile.in.orig Wed Oct 16 14:00:35 2002	12	--- doc/Makefile.in.orig Sat May 29 23:25:16 2004
13	+++ doc/Makefile.in Sat Nov 23 16:21:05 2002	13	+++ doc/Makefile.in Sat May 29 23:25:18 2004
14	@@ -127,7 +127,7 @@	14	@@ -214,7 +214,7 @@
15	# Lets put the informational stuff in a sub directory to avoid	15	# Lets put the informational stuff in a sub directory to avoid
16	# polluting /usr/local for default installs.	16	# polluting /usr/local for default installs.
17	#	17	#
18	-docdir = $(prefix)/Xbae	18	-docdir = $(datadir)/Xbae
19	+docdir = $(datadir)/Xbae	19	+docdir = $(datadir)/doc/Xbae
20
21	doc_DATA = \	20	doc_DATA = \
22	contents.html coverplus.html difffonts.html \	21	contents.html coverplus.html difffonts.html \
		22	index.html main.html morelines.html \
23	--- Makefile.am.orig Tue Aug 20 12:03:13 2002	23	--- Makefile.am.orig Tue Aug 20 12:03:13 2002
24	+++ Makefile.am Sat Nov 23 16:28:21 2002	24	+++ Makefile.am Sat Nov 23 16:28:21 2002
25	@@ -16,7 +16,7 @@	25	@@ -16,7 +16,7 @@
Lines 27-88 Link Here
27	endif	27	endif
28		28
29	-docdir= $(prefix)/Xbae	29	-docdir= $(prefix)/Xbae
30	+docdir= $(datadir)/Xbae	30	+docdir= $(datadir)/doc/Xbae
31	doc_DATA= NEWS README INSTALL	31	doc_DATA= NEWS README
32		32
33	.PHONY: changelog UpdateCheck	33	.PHONY: changelog UpdateCheck
34	--- Makefile.in.orig Wed Oct 16 13:56:23 2002	34	--- Makefile.in.orig Sat May 29 22:51:17 2004
35	+++ Makefile.in Sat Nov 23 16:28:17 2002	35	+++ Makefile.in Sat May 29 23:03:58 2004
36	@@ -125,7 +125,7 @@	36	@@ -226,7 +226,7 @@
37		37
		38	aclocaldir = @ACLOCALDIR@
38	@Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4	39	@Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
39
40	-docdir = $(prefix)/Xbae	40	-docdir = $(prefix)/Xbae
41	+docdir = $(datadir)/Xbae	41	+docdir = $(datadir)/doc/Xbae
42	doc_DATA = NEWS README INSTALL	42	doc_DATA = NEWS README
43		43
44	#	44	#
45	--- examples/builderXcessory/Makefile.am.orig Tue Jan 25 17:39:52 2000	45	@@ -627,7 +627,7 @@
46	+++ examples/builderXcessory/Makefile.am Sat Nov 23 16:27:50 2002	46
		47	info-am:
		48
		49	-install-data-am: install-aclocalDATA install-docDATA
		50	+install-data-am: install-docDATA
		51
		52	install-exec-am:
		53
		54	--- examples/builderXcessory/Makefile.am.orig Sat May 29 23:20:22 2004
		55	+++ examples/builderXcessory/Makefile.am Sat May 29 23:20:26 2004
47	@@ -9,7 +9,7 @@	56	@@ -9,7 +9,7 @@
48	xbae.wml \	57	xbae.wml \
49	xbae_ctrl.tcl	58	xbae_ctrl.tcl
50		59
51	-examplesdir = $(prefix)/Xbae/examples/builderXcessory	60	-examplesdir = $(datadir)/Xbae/examples/builderXcessory
52	+examplesdir = $(datadir)/Xbae/examples/builderXcessory	61	+examplesdir = $(datadir)/examples/Xbae/builderXcessory
53	examples_DATA = \	62	examples_DATA = \
54	XbaeCaption.col XbaeInput.col XbaeMatrix.col \	63	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
55	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \	64	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
56	--- examples/builderXcessory/Makefile.in.orig Wed Oct 16 14:00:28 2002	65	--- examples/builderXcessory/Makefile.in.orig Sat May 29 23:23:48 2004
57	+++ examples/builderXcessory/Makefile.in Sat Nov 23 16:27:46 2002	66	+++ examples/builderXcessory/Makefile.in Sat May 29 23:23:52 2004
58	@@ -122,7 +122,7 @@	67	@@ -203,7 +203,7 @@
		68	xbae.wml \
59	xbae_ctrl.tcl	69	xbae_ctrl.tcl
60		70
61		71	-examplesdir = $(datadir)/Xbae/examples/builderXcessory
62	-examplesdir = $(prefix)/Xbae/examples/builderXcessory	72	+examplesdir = $(datadir)/examples/Xbae/builderXcessory
63	+examplesdir = $(datadir)/Xbae/examples/builderXcessory
64	examples_DATA = \	73	examples_DATA = \
65	XbaeCaption.col XbaeInput.col XbaeMatrix.col \	74	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
66	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \	75	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
67	--- doc/images/Makefile.am.orig Tue Aug 20 14:11:11 2002	76	--- src/Makefile.in.orig Sat May 29 23:37:07 2004
68	+++ doc/images/Makefile.am Sat Nov 23 16:27:21 2002	77	+++ src/Makefile.in Sat May 29 23:37:10 2004
		78	@@ -525,7 +525,7 @@
		79
		80	info-am:
		81
		82	-install-data-am: install-htmlDATA install-man
		83	+install-data-am: install-man
		84
		85	install-exec-am: install-libLTLIBRARIES
		86
		87	--- doc/images/Makefile.am.orig Sat May 29 23:25:49 2004
		88	+++ doc/images/Makefile.am Sat May 29 23:25:53 2004
69	@@ -10,7 +10,7 @@	89	@@ -10,7 +10,7 @@
70	# Lets put the informational stuff in a sub directory to avoid	90	# Lets put the informational stuff in a sub directory to avoid
71	# polluting /usr/local for default installs.	91	# polluting /usr/local for default installs.
72	#	92	#
73	-imagedir= $(exec_prefix)/Xbae/images	93	-imagedir= $(datadir)/Xbae/images
74	+imagedir= $(datadir)/Xbae/images	94	+imagedir= $(datadir)/doc/Xbae/images
75		95
76		96
77		97
78	--- doc/images/Makefile.in.orig Wed Oct 16 14:00:42 2002	98	--- doc/images/Makefile.in.orig Sat May 29 23:26:09 2004
79	+++ doc/images/Makefile.in Sat Nov 23 16:27:15 2002	99	+++ doc/images/Makefile.in Sat May 29 23:26:14 2004
80	@@ -122,7 +122,7 @@	100	@@ -203,7 +203,7 @@
81	# Lets put the informational stuff in a sub directory to avoid	101	# Lets put the informational stuff in a sub directory to avoid
82	# polluting /usr/local for default installs.	102	# polluting /usr/local for default installs.
83	#	103	#
84	-imagedir = $(exec_prefix)/Xbae/images	104	-imagedir = $(datadir)/Xbae/images
85	+imagedir = $(datadir)/Xbae/images	105	+imagedir = $(datadir)/doc/Xbae/images
86		106
87	#	107	#
88	# Cut the distribution size, don't distribute these in a source	108	# Cut the distribution size, don't distribute these in a source