Fix building on linux and solaris, rewrite patch, and move xforms changes to an individual xforms patch.

lyx/lyx.patch

@@ -1,157 +1,279 @@
---- Imakefile.dist	Thu Feb 20 15:00:08 2003
-+++ Imakefile	Thu Feb 20 16:42:03 2003
-@@ -2,13 +2,13 @@
- 
- /* Fairly important stuff */
- 
--#define OptimizationLevel -O4
-+#define OptimizationLevel -O2
- #define DoWall NO
- 
--#define BuildShared YES
-+#define BuildShared NO
- #define StaticLink YES
- 
--#define BuildGL YES
-+#define BuildGL NO
- 
- 
- /* Less Important or System Specific */
-@@ -32,23 +32,23 @@
- 
- /* Out in the Tall Weeds */
- 
--#define InstallNonstandard NO
--#define XFormsNonstandardInstallDir /usr/local
-+#define InstallNonstandard YES
-+#define XFormsNonstandardInstallDir @l_prefix@
- 
--#define NonstandardXpm NO
-+#define NonstandardXpm YES
- 
--#define XpmIncLoc /usr/local/include
--#define XpmLibLoc /usr/local/lib
-+#define XpmIncLoc @l_prefix@/include/X11
-+#define XpmLibLoc @l_prefix@/lib
- 
--#define NonstandardTiff NO
-+#define NonstandardTiff YES
- 
--#define TiffIncLoc /usr/local/include
--#define TiffLibLoc /usr/local/lib
-+#define TiffIncLoc @l_prefix@/include
-+#define TiffLibLoc @l_prefix@/lib
- 
--#define NonstandardJpeg NO
-+#define NonstandardJpeg YES
- 
--#define JpegIncLoc /usr/local/include
--#define JpegLibLoc /usr/local/lib
-+#define JpegIncLoc @l_prefix@/include
-+#define JpegLibLoc @l_prefix@/lib
- 
- ######################################################################
- #                                                                    #
---- demos/Imakefile.dist	Thu Feb 20 15:26:40 2003
-+++ demos/Imakefile	Thu Feb 20 16:42:09 2003
-@@ -154,7 +154,7 @@
- 		  -I.
- 
- DEPEND_DEFINES	= \
--		  -I/usr/local/include
-+		  -I@l_prefix@/include
- 
- EXTRA_LIBRARIES	= \
- 		  $(STATIC) \
-@@ -176,7 +176,7 @@
- 
- #if Optimize
- IMAKE_OPTIMIZE  = -DDoOptimize=1
--OPTIMIZER	= -O4
-+OPTIMIZER	= -O2
- #else
- OPTIMIZER	=
- #endif
---- fd2ps/Imakefile.dist	Thu Feb 20 15:26:40 2003
-+++ fd2ps/Imakefile	Thu Feb 20 16:41:52 2003
-@@ -64,7 +64,7 @@
- 		  -I.
- 
- DEPEND_DEFINES	= \
--		  -I/usr/local/include
-+		  -I@l_prefix@/include
- 
- EXTRA_LIBRARIES	= \
- 		  $(STATIC) \
-@@ -83,7 +83,7 @@
- CDEBUGFLAGS	= -g $(OPTIMIZER)
- #if Optimize
- IMAKE_OPTIMIZE  = -DDoOptimize=1
--OPTIMIZER	= -O4
-+OPTIMIZER	= -O2
- #else
- OPTIMIZER	=
- #endif
---- fdesign/Imakefile.dist	Thu Feb 20 15:26:40 2003
-+++ fdesign/Imakefile	Thu Feb 20 15:27:27 2003
-@@ -99,7 +99,7 @@
- 		  -I.
- 
- DEPEND_DEFINES	= \
--		  -I/usr/local/include
-+		  -I@l_prefix@/include
- 
- 
- EXTRA_LIBRARIES	= \
---- gl/Imakefile.dist	Thu Feb 20 15:26:40 2003
-+++ gl/Imakefile	Thu Feb 20 15:28:52 2003
-@@ -44,7 +44,7 @@
- REQUIREDLIBS	= \
- 		  $(LDPRELIB) \
- 		  $(XLIB) \
--		  -L/usr/local/lib \
-+		  -L@l_prefix@/lib \
- 		  -L../lib -lforms \
- 		  -lGL \
- 		  $(LGCC)
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QDocument.C lyx-1.3.1/src/frontends/qt2/QDocument.C
+--- lyx-1.3.1.orig/src/frontends/qt2/QDocument.C	2003-04-29 10:14:36.487493720 +0200
++++ lyx-1.3.1/src/frontends/qt2/QDocument.C	2003-04-29 10:17:23.770730673 +0200
+@@ -275,7 +275,7 @@
+ 		break;
+ 	case 3:
+ 	{
+-		LyXLength::UNIT unit =
++		LyXLength::LENUNIT unit =
+ 			dialog_->layoutModule->skipLengthCO->
+ 			currentLengthItem();
+ 		double length =
+@@ -382,7 +382,7 @@
+ 
+ 	// set the default unit
+ 	// FIXME: move to controller
+-	LyXLength::UNIT defaultUnit = LyXLength::CM;
++	LyXLength::LENUNIT defaultUnit = LyXLength::CM;
+ 	switch (lyxrc.default_papersize) {
+ 		case BufferParams::PAPER_DEFAULT: break;
+ 
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C lyx-1.3.1/src/frontends/qt2/QGraphics.C
+--- lyx-1.3.1.orig/src/frontends/qt2/QGraphics.C	2003-04-29 10:14:36.489484058 +0200
++++ lyx-1.3.1/src/frontends/qt2/QGraphics.C	2003-04-29 10:17:39.566260764 +0200
+@@ -141,7 +141,7 @@
+ 	InsetGraphicsParams & igp = controller().params();
+ 
+ 	// set the right default unit
+-	LyXLength::UNIT unitDefault = LyXLength::CM;
++	LyXLength::LENUNIT unitDefault = LyXLength::CM;
+ 	switch (lyxrc.default_papersize) {
+ 		case BufferParams::PAPER_DEFAULT: break;
+ 
+@@ -260,7 +260,7 @@
+ 	}
+ 	// 2. the height (a lengthgcombo type)
+ 	dialog_->height->setText(toqstr(tostr(igp.height.value())));
+-	LyXLength::UNIT unit_ = (igp.height.value() > 0.0) ?
++	LyXLength::LENUNIT unit_ = (igp.height.value() > 0.0) ?
+ 		igp.height.unit() : unitDefault;
+ 	dialog_->heightUnit->setCurrentItem(unit_);
+ 
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C lyx-1.3.1/src/frontends/qt2/QMinipage.C
+--- lyx-1.3.1.orig/src/frontends/qt2/QMinipage.C	2003-04-29 10:14:36.492430471 +0200
++++ lyx-1.3.1/src/frontends/qt2/QMinipage.C	2003-04-29 10:17:57.366972496 +0200
+@@ -56,7 +56,7 @@
+ void QMinipage::apply()
+ {
+ 	double const value = strToDbl(fromqstr(dialog_->widthED->text()));
+-	LyXLength::UNIT unit = dialog_->unitsLC->currentLengthItem();
++	LyXLength::LENUNIT unit = dialog_->unitsLC->currentLengthItem();
+ 	if (dialog_->widthED->text().isEmpty())
+ 		unit = LyXLength::UNIT_NONE;
+ 
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C lyx-1.3.1/src/frontends/qt2/qt_helpers.C
+--- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.C	2003-04-29 10:14:36.508465835 +0200
++++ lyx-1.3.1/src/frontends/qt2/qt_helpers.C	2003-04-29 10:18:14.033381605 +0200
+@@ -67,14 +67,14 @@
+ 	if (isValidGlueLength(fromqstr(length)))
+ 		return fromqstr(length);
+ 
+-	LyXLength::UNIT unit = combo->currentLengthItem();
++	LyXLength::LENUNIT unit = combo->currentLengthItem();
+ 
+ 	return LyXLength(length.toDouble(), unit).asString();
+ }
+ 
+ 
+ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
+-	string const & len, LyXLength::UNIT defaultUnit)
++	string const & len, LyXLength::LENUNIT defaultUnit)
+ {
+ 	if (len.empty()) {
+ 		// no length (UNIT_NONE)
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h lyx-1.3.1/src/frontends/qt2/qt_helpers.h
+--- lyx-1.3.1.orig/src/frontends/qt2/qt_helpers.h	2003-04-29 10:14:36.508316627 +0200
++++ lyx-1.3.1/src/frontends/qt2/qt_helpers.h	2003-04-29 10:18:25.972214609 +0200
+@@ -35,7 +35,7 @@
+  
+ /// method to set widgets from a LyXLength
+ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
+-	string const & len, LyXLength::UNIT default_unit);
++	string const & len, LyXLength::LENUNIT default_unit);
+  
+ /**
+  * toqstr - convert char * into unicode
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QTabular.C lyx-1.3.1/src/frontends/qt2/QTabular.C
+--- lyx-1.3.1.orig/src/frontends/qt2/QTabular.C	2003-04-29 10:14:36.502484876 +0200
++++ lyx-1.3.1/src/frontends/qt2/QTabular.C	2003-04-29 10:18:36.772529236 +0200
+@@ -165,7 +165,7 @@
+ 	bool const isReadonly = bc().bp().isReadOnly();
+ 	dialog_->specialAlignmentED->setEnabled(!isReadonly);
+ 
+-	LyXLength::UNIT default_unit = controller().metric() ? LyXLength::CM : LyXLength::IN;
++	LyXLength::LENUNIT default_unit = controller().metric() ? LyXLength::CM : LyXLength::IN;
+ 	if (!pwidth.zero()) {
+ 		dialog_->widthED->setText(toqstr(tostr(pwidth.value())));
+ 		dialog_->widthUnit->setCurrentItem(pwidth.unit());
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/QWrap.C lyx-1.3.1/src/frontends/qt2/QWrap.C
+--- lyx-1.3.1.orig/src/frontends/qt2/QWrap.C	2003-04-29 10:14:36.505016784 +0200
++++ lyx-1.3.1/src/frontends/qt2/QWrap.C	2003-04-29 10:18:48.057925307 +0200
 @@ -56,7 +56,7 @@
- 		  -I.
- 
- DEPEND_DEFINES	= \
--		  -I/usr/local/include
-+		  -I@l_prefix@/include
- 
- EXTRA_DEFINES	= \
- 		  -DMAKING_FORMS \
---- image/Imakefile.dist	Thu Feb 20 15:41:45 2003
-+++ image/Imakefile	Thu Feb 20 15:28:08 2003
-@@ -88,7 +88,7 @@
- 		  -I.
- 
- DEPEND_DEFINES	= \
--		  -I/usr/local/include
-+		  -I@l_prefix@/include
- 
- EXTRA_DEFINES	= \
- 		  $(HAVE_STRERROR )
-@@ -121,7 +121,8 @@
- REQUIREDLIBS	= \
- 		  $(LDPRELIB) \
- 		  $(XLIB) \
--		  -L/usr/local/lib \
-+		  $(LDFLAGS) \
-+		  -L@l_prefix@/lib \
- 		  -L../lib -lforms \
- 		  $(JPEGLIBDIR) -ljpeg \
- 		  $(TIFFLIBDIR) -ltiff \
---- lib/Imakefile.dist	Thu Feb 20 15:02:58 2003
-+++ lib/Imakefile	Thu Feb 20 15:03:08 2003
-@@ -128,7 +128,7 @@
- 		  -Ifd
- 
- DEPEND_DEFINES	= \
--		  -I/usr/local/include
-+		  -I@l_prefix@/include
- 
- #if !BuildGL
- NO_GL		= -DNO_GL
+ void QWrap::apply()
+ {
+ 	double const value = strToDbl(fromqstr(dialog_->widthED->text()));
+-	LyXLength::UNIT unit = dialog_->unitsLC->currentLengthItem();
++	LyXLength::LENUNIT unit = dialog_->unitsLC->currentLengthItem();
+ 	if (dialog_->widthED->text().isEmpty())
+ 		unit = LyXLength::UNIT_NONE;
+ 
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/ClassModuleBase.ui	2003-04-29 10:14:36.530736311 +0200
++++ lyx-1.3.1/src/frontends/qt2/ui/ClassModuleBase.ui	2003-04-29 10:19:00.507553445 +0200
+@@ -322,7 +322,7 @@
+             <verdata>5</verdata>
+         </sizepolicy>
+         <pixmap>image0</pixmap>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+     </customwidget>
+ </customwidgets>
+ <images>
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/MarginsModuleBase.ui	2003-04-29 10:14:36.531483639 +0200
++++ lyx-1.3.1/src/frontends/qt2/ui/MarginsModuleBase.ui	2003-04-29 10:19:10.504091112 +0200
+@@ -401,7 +401,7 @@
+             <verdata>5</verdata>
+         </sizepolicy>
+         <pixmap>image0</pixmap>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+     </customwidget>
+ </customwidgets>
+ <images>
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/PaperModuleBase.ui	2003-04-29 10:14:36.532370372 +0200
++++ lyx-1.3.1/src/frontends/qt2/ui/PaperModuleBase.ui	2003-04-29 10:19:18.879282050 +0200
+@@ -286,7 +286,7 @@
+             <verdata>5</verdata>
+         </sizepolicy>
+         <pixmap>image0</pixmap>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+     </customwidget>
+ </customwidgets>
+ <images>
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QGraphicsDialogBase.ui	2003-04-29 10:14:36.540505812 +0200
++++ lyx-1.3.1/src/frontends/qt2/ui/QGraphicsDialogBase.ui	2003-04-29 10:19:26.681562509 +0200
+@@ -1212,7 +1212,7 @@
+             <verdata>5</verdata>
+         </sizepolicy>
+         <pixmap>image0</pixmap>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+     </customwidget>
+ </customwidgets>
+ <images>
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QMinipageDialogBase.ui	2003-04-29 10:14:36.545443862 +0200
++++ lyx-1.3.1/src/frontends/qt2/ui/QMinipageDialogBase.ui	2003-04-29 10:19:54.955951154 +0200
+@@ -346,7 +346,7 @@
+             <verdata>5</verdata>
+         </sizepolicy>
+         <pixmap>image0</pixmap>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+     </customwidget>
+ </customwidgets>
+ <images>
+@@ -364,7 +364,7 @@
+     </connection>
+     <connection>
+         <sender>unitsLC</sender>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+         <receiver>QMinipageDialogBase</receiver>
+         <slot>change_adaptor()</slot>
+     </connection>
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QTabularDialogBase.ui	2003-04-29 10:14:36.558619619 +0200
++++ lyx-1.3.1/src/frontends/qt2/ui/QTabularDialogBase.ui	2003-04-29 10:20:24.883229624 +0200
+@@ -1356,7 +1356,7 @@
+             <verdata>5</verdata>
+         </sizepolicy>
+         <pixmap>image0</pixmap>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+     </customwidget>
+     <customwidget>
+         <class>QSetBorder</class>
+@@ -1577,7 +1577,7 @@
+     </connection>
+     <connection>
+         <sender>widthUnit</sender>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+         <receiver>QTabularDialogBase</receiver>
+         <slot>width_changed()</slot>
+     </connection>
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui
+--- lyx-1.3.1.orig/src/frontends/qt2/ui/QWrapDialogBase.ui	2003-04-29 10:14:36.561297002 +0200
++++ lyx-1.3.1/src/frontends/qt2/ui/QWrapDialogBase.ui	2003-04-29 10:20:39.279541103 +0200
+@@ -340,7 +340,7 @@
+             <verdata>5</verdata>
+         </sizepolicy>
+         <pixmap>image0</pixmap>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+     </customwidget>
+ </customwidgets>
+ <images>
+@@ -358,7 +358,7 @@
+     </connection>
+     <connection>
+         <sender>unitsLC</sender>
+-        <signal>selectionChanged(LyXLength::UNIT)</signal>
++        <signal>selectionChanged(LyXLength::LENUNIT)</signal>
+         <receiver>QWrapDialogBase</receiver>
+         <slot>change_adaptor()</slot>
+     </connection>
+diff -Naur lyx-1.3.1.orig/src/lengthcommon.C lyx-1.3.1/src/lengthcommon.C
+--- lyx-1.3.1.orig/src/lengthcommon.C	2003-04-29 10:14:36.267553251 +0200
++++ lyx-1.3.1/src/lengthcommon.C	2003-04-29 10:20:58.940480513 +0200
+@@ -45,10 +45,10 @@
+ //	N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
+ //	N_("theight%"), N_("pheight%") };
+ 
+-LyXLength::UNIT unitFromString(string const & data)
++LyXLength::LENUNIT unitFromString(string const & data)
+ {
+ 	int i = 0;
+ 	while (i < num_units && data != unit_name[i])
+ 		++i;
+-	return static_cast<LyXLength::UNIT>(i);
++	return static_cast<LyXLength::LENUNIT>(i);
+ }
+diff -Naur lyx-1.3.1.orig/src/lengthcommon.h lyx-1.3.1/src/lengthcommon.h
+--- lyx-1.3.1.orig/src/lengthcommon.h	2003-04-29 10:14:36.267695290 +0200
++++ lyx-1.3.1/src/lengthcommon.h	2003-04-29 10:21:09.266821769 +0200
+@@ -19,7 +19,7 @@
+ extern char const * unit_name_ltx[];
+ 
+ /// return the unit given a string representation such as "cm"
+-LyXLength::UNIT unitFromString(string const & data);
++LyXLength::LENUNIT unitFromString(string const & data);
+ 
+ 
+ #endif // LENGTH_COMMON_H
+diff -Naur lyx-1.3.1.orig/src/lyxlength.C lyx-1.3.1/src/lyxlength.C
+--- lyx-1.3.1.orig/src/lyxlength.C	2003-04-29 10:14:36.274763602 +0200
++++ lyx-1.3.1/src/lyxlength.C	2003-04-29 10:21:26.441919128 +0200
+@@ -31,7 +31,7 @@
+ {}
+ 
+ 
+-LyXLength::LyXLength(double v, LyXLength::UNIT u)
++LyXLength::LyXLength(double v, LyXLength::LENUNIT u)
+ 	: val_(v), unit_(u)
+ {}
+ 
+@@ -99,7 +99,7 @@
+ }
+ 
+ 
+-LyXLength::UNIT LyXLength::unit() const
++LyXLength::LENUNIT LyXLength::unit() const
+ {
+ 	return unit_;
+ }
+@@ -111,7 +111,7 @@
+ }
+ 
+ 
+-void LyXLength::unit(LyXLength::UNIT u)
++void LyXLength::unit(LyXLength::LENUNIT u)
+ {
+ 	unit_ = u;
+ }

lyx/lyx.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Print
 License:      GPL
 Version:      %{V_lyx}
-Release:      20030428
+Release:      20030429
 
 #   package options
 %option       with_qt no
@@ -46,6 +46,7 @@ Release:      20030428
 Source0:      ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{V_lyx}.tar.gz
 Source1:      http://savannah.nongnu.org/download/xforms/stable.pkg/%{V_xforms}/xforms-%{V_xforms}.tar.gz
 Patch0:       lyx.patch
+Patch1:       xforms.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -69,11 +70,12 @@ AutoReqProv:  no
     details of visual layout to the software.
 
 %prep
-    %setup -q -c
+    %setup -q
+    %patch0 -p1
 %if "%{with_qt}" != "yes"
     %setup -q -T -D -a 1
     ( cd xforms-%{V_xforms}
-      %patch0 -p0
+      %patch1 -p0
     ) || exit 1
 %endif
 

lyx/xforms.patch

@@ -0,0 +1,157 @@
+--- Imakefile.dist	Thu Feb 20 15:00:08 2003
++++ Imakefile	Thu Feb 20 16:42:03 2003
+@@ -2,13 +2,13 @@
+ 
+ /* Fairly important stuff */
+ 
+-#define OptimizationLevel -O4
++#define OptimizationLevel -O2
+ #define DoWall NO
+ 
+-#define BuildShared YES
++#define BuildShared NO
+ #define StaticLink YES
+ 
+-#define BuildGL YES
++#define BuildGL NO
+ 
+ 
+ /* Less Important or System Specific */
+@@ -32,23 +32,23 @@
+ 
+ /* Out in the Tall Weeds */
+ 
+-#define InstallNonstandard NO
+-#define XFormsNonstandardInstallDir /usr/local
++#define InstallNonstandard YES
++#define XFormsNonstandardInstallDir @l_prefix@
+ 
+-#define NonstandardXpm NO
++#define NonstandardXpm YES
+ 
+-#define XpmIncLoc /usr/local/include
+-#define XpmLibLoc /usr/local/lib
++#define XpmIncLoc @l_prefix@/include/X11
++#define XpmLibLoc @l_prefix@/lib
+ 
+-#define NonstandardTiff NO
++#define NonstandardTiff YES
+ 
+-#define TiffIncLoc /usr/local/include
+-#define TiffLibLoc /usr/local/lib
++#define TiffIncLoc @l_prefix@/include
++#define TiffLibLoc @l_prefix@/lib
+ 
+-#define NonstandardJpeg NO
++#define NonstandardJpeg YES
+ 
+-#define JpegIncLoc /usr/local/include
+-#define JpegLibLoc /usr/local/lib
++#define JpegIncLoc @l_prefix@/include
++#define JpegLibLoc @l_prefix@/lib
+ 
+ ######################################################################
+ #                                                                    #
+--- demos/Imakefile.dist	Thu Feb 20 15:26:40 2003
++++ demos/Imakefile	Thu Feb 20 16:42:09 2003
+@@ -154,7 +154,7 @@
+ 		  -I.
+ 
+ DEPEND_DEFINES	= \
+-		  -I/usr/local/include
++		  -I@l_prefix@/include
+ 
+ EXTRA_LIBRARIES	= \
+ 		  $(STATIC) \
+@@ -176,7 +176,7 @@
+ 
+ #if Optimize
+ IMAKE_OPTIMIZE  = -DDoOptimize=1
+-OPTIMIZER	= -O4
++OPTIMIZER	= -O2
+ #else
+ OPTIMIZER	=
+ #endif
+--- fd2ps/Imakefile.dist	Thu Feb 20 15:26:40 2003
++++ fd2ps/Imakefile	Thu Feb 20 16:41:52 2003
+@@ -64,7 +64,7 @@
+ 		  -I.
+ 
+ DEPEND_DEFINES	= \
+-		  -I/usr/local/include
++		  -I@l_prefix@/include
+ 
+ EXTRA_LIBRARIES	= \
+ 		  $(STATIC) \
+@@ -83,7 +83,7 @@
+ CDEBUGFLAGS	= -g $(OPTIMIZER)
+ #if Optimize
+ IMAKE_OPTIMIZE  = -DDoOptimize=1
+-OPTIMIZER	= -O4
++OPTIMIZER	= -O2
+ #else
+ OPTIMIZER	=
+ #endif
+--- fdesign/Imakefile.dist	Thu Feb 20 15:26:40 2003
++++ fdesign/Imakefile	Thu Feb 20 15:27:27 2003
+@@ -99,7 +99,7 @@
+ 		  -I.
+ 
+ DEPEND_DEFINES	= \
+-		  -I/usr/local/include
++		  -I@l_prefix@/include
+ 
+ 
+ EXTRA_LIBRARIES	= \
+--- gl/Imakefile.dist	Thu Feb 20 15:26:40 2003
++++ gl/Imakefile	Thu Feb 20 15:28:52 2003
+@@ -44,7 +44,7 @@
+ REQUIREDLIBS	= \
+ 		  $(LDPRELIB) \
+ 		  $(XLIB) \
+-		  -L/usr/local/lib \
++		  -L@l_prefix@/lib \
+ 		  -L../lib -lforms \
+ 		  -lGL \
+ 		  $(LGCC)
+@@ -56,7 +56,7 @@
+ 		  -I.
+ 
+ DEPEND_DEFINES	= \
+-		  -I/usr/local/include
++		  -I@l_prefix@/include
+ 
+ EXTRA_DEFINES	= \
+ 		  -DMAKING_FORMS \
+--- image/Imakefile.dist	Thu Feb 20 15:41:45 2003
++++ image/Imakefile	Thu Feb 20 15:28:08 2003
+@@ -88,7 +88,7 @@
+ 		  -I.
+ 
+ DEPEND_DEFINES	= \
+-		  -I/usr/local/include
++		  -I@l_prefix@/include
+ 
+ EXTRA_DEFINES	= \
+ 		  $(HAVE_STRERROR )
+@@ -121,7 +121,8 @@
+ REQUIREDLIBS	= \
+ 		  $(LDPRELIB) \
+ 		  $(XLIB) \
+-		  -L/usr/local/lib \
++		  $(LDFLAGS) \
++		  -L@l_prefix@/lib \
+ 		  -L../lib -lforms \
+ 		  $(JPEGLIBDIR) -ljpeg \
+ 		  $(TIFFLIBDIR) -ltiff \
+--- lib/Imakefile.dist	Thu Feb 20 15:02:58 2003
++++ lib/Imakefile	Thu Feb 20 15:03:08 2003
+@@ -128,7 +128,7 @@
+ 		  -Ifd
+ 
+ DEPEND_DEFINES	= \
+-		  -I/usr/local/include
++		  -I@l_prefix@/include
+ 
+ #if !BuildGL
+ NO_GL		= -DNO_GL