--- Makefile.in.orig	Fri Feb 26 02:15:51 1999
+++ Makefile.in	Tue Mar  2 19:50:23 1999
@@ -129,7 +129,7 @@
 EXTRA_DIST =  	obGnomeConf.sh.in 		gnome-objc.spec.in			obgnome-config.in
 
 
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
 confexec_DATA = obGnomeConf.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -473,10 +473,10 @@
 @MAINT@	cd macros && $(MAKE) macros.dep
 
 obGnomeConf.sh: obGnomeConf.sh.in Makefile
-	sed -e 's,\@OBGNOME_LIBDIR\@,$(OBGNOME_LIBDIR),g' \
-	    -e 's,\@OBGNOME_INCLUDEDIR\@,$(OBGNOME_INCLUDEDIR),g' \
-	    -e 's,\@OBGNOME_LIBS\@,$(OBGNOME_LIBS),g' \
-	    -e 's,\@OBGTK_LIBS\@,$(OBGTK_LIBS),g' \
+	sed -e 's^\@OBGNOME_LIBDIR\@^$(OBGNOME_LIBDIR)^g' \
+	    -e 's^\@OBGNOME_INCLUDEDIR\@^$(OBGNOME_INCLUDEDIR)^g' \
+	    -e 's^\@OBGNOME_LIBS\@^$(OBGNOME_LIBS)^g' \
+	    -e 's^\@OBGTK_LIBS\@^$(OBGTK_LIBS)^g' \
 	      < $(srcdir)/obGnomeConf.sh.in > obGnomeConf.tmp \
 	  && mv obGnomeConf.tmp obGnomeConf.sh
 
--- obgnome/Makefile.in.orig	Mon Feb  1 04:29:10 1999
+++ obgnome/Makefile.in	Mon Feb  1 04:30:42 1999
@@ -136,7 +136,7 @@
 
 lib_LTLIBRARIES = libobgnome.la
 
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) 	-DGNOMELIBDIR=\""$(libdir)"\" 			-DGNOMEDATADIR=\""$(datadir)"\" 		-DGNOMELOCALEDIR=\""$(datadir)/locale\"" 	$(GNOME_INCLUDEDIR)				-I$(top_srcdir)/intl
+INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) 	-DGNOMELIBDIR=\""$(libdir)"\" 			-DGNOMEDATADIR=\""$(datadir)"\" 		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" 	$(GNOME_INCLUDEDIR)				-I$(top_srcdir)/intl
 
 
 libobgnome_la_SOURCES =  	obgnomeAnimator.m 	obgnomeApp.m 	obgnomeAppWin.m 	obgnomeAbout.m 	obgnomeCalculator.m 	obgnomeCanvas.m 	obgnomeCanvasLine.m 	obgnomeCanvasRectEllipse.m 	obgnomeCanvasText.m 	obgnomeCanvasWidget.m 	obgnomeDateEdit.m 	obgnomeDialog.m 	obgnomeEntry.m 	obgnomeFileEntry.m 	obgnomeFontSelector.m 	obgnomeLess.m 	obgnomeMessageBox.m 	obgnomePixmap.m 	obgnomePropertyBox.m 	obgnomeStock.m 	obgnomeStockButton.m
@@ -145,7 +145,7 @@
 libobgnomeinclude_HEADERS =  	obgnome.h 	obgnomeAnimator.h 	obgnomeApp.h 	obgnomeAppWin.h 	obgnomeAbout.h 	obgnomeCalculator.h 	obgnomeCanvas.h 	obgnomeCanvasLine.h 	obgnomeCanvasRectEllipse.h 	obgnomeCanvasText.h 	obgnomeCanvasWidget.h 	obgnomeDateEdit.h 	obgnomeDialog.h 	obgnomeEntry.h 	obgnomeFileEntry.h 	obgnomeFontSelector.h 	obgnomeLess.h 	obgnomeMessageBox.h 	obgnomePixmap.h 	obgnomePropertyBox.h 	obgnomeStock.h 	obgnomeStockButton.h 
 
 
-libobgnome_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libobgnome_la_LDFLAGS = -version-info 1:0:0
 libobgnome_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOME_LIBS) 	$(GTK_LIBS)
 
 
--- obgtk/Makefile.in.orig	Mon Feb  1 04:31:03 1999
+++ obgtk/Makefile.in	Mon Feb  1 04:31:30 1999
@@ -118,7 +118,7 @@
 
 lib_LTLIBRARIES = libobgtk.la
 
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) 	-DGNOMELIBDIR=\""$(libdir)"\" 	-DGNOMEDATADIR=\""$(datadir)"\" 	-DGNOMELOCALEDIR=\""$(datadir)/locale\"" 	-I$(top_srcdir)/intl
+INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) 	-DGNOMELIBDIR=\""$(libdir)"\" 	-DGNOMEDATADIR=\""$(datadir)"\" 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" 	-I$(top_srcdir)/intl
 
 
 #libobgtk_la_DEPENDENCIES = @OBGTK_ACCEL_OBJS@
@@ -129,7 +129,7 @@
 libobgtkinclude_HEADERS = obgtk.h 	obgtkAccelGroup.h 	obgtkAccelLabel.h 	obgtkAdjustment.h 	obgtkAlignment.h 	obgtkApp.h 	obgtkArrow.h 	obgtkAspectFrame.h 	obgtkBin.h 	obgtkBox.h 	obgtkButton.h 	obgtkButtonBox.h 	obgtkCalendar.h 	obgtkCheckButton.h 	obgtkCheckMenuItem.h 	obgtkCList.h 	obgtkCTree.h 	obgtkColorSelection.h 	obgtkColorSelectionDialog.h 	obgtkCombo.h 	obgtkContainer.h 	obgtkCurve.h 	obgtkData.h 	obgtkDialog.h 	obgtkDrawingArea.h 	obgtkEditable.h 	obgtkEntry.h 	obgtkEventBox.h 	obgtkFileSelection.h 	obgtkFixed.h 	obgtkFontSelection.h 	obgtkFrame.h 	obgtkGammaCurve.h 	obgtkHandleBox.h 	obgtkHBox.h 	obgtkHButtonBox.h 	obgtkHPaned.h 	obgtkHRuler.h 	obgtkHScale.h 	obgtkHScrollbar.h 	obgtkHSeparator.h 	obgtkImage.h 	obgtkInputDialog.h 	obgtkItem.h 	obgtkLabel.h 	obgtkLayout.h 	obgtkList.h 	obgtkListItem.h 	obgtkMenu.h 	obgtkMenuBar.h 	obgtkMenuItem.h 	obgtkMenuShell.h 	obgtkMisc.h 	obgtkNotebook.h 	obgtkObject.h 	obgtkOptionMenu.h 	obgtkPacker.h 	obgtkPaned.h 	obgtkPixmap.h 	obgtkPreview.h 	obgtkProgress.h 	obgtkProgressBar.h 	obgtkRadioButton.h 	obgtkRadioMenuItem.h 	obgtkRange.h 	obgtkRuler.h 	obgtkScale.h 	obgtkScrollbar.h 	obgtkScrolledWindow.h 	obgtkSeparator.h 	obgtkSpinButton.h 	obgtkStatusbar.h 	obgtkTable.h 	obgtkTearoffMenuItem.h 	obgtkText.h 	obgtkTipsQuery.h 	obgtkToggleButton.h 	obgtkToolbar.h 	obgtkTooltips.h 	obgtkTree.h 	obgtkTreeItem.h 	obgtkVBox.h 	obgtkVButtonBox.h 	obgtkVPaned.h 	obgtkVRuler.h 	obgtkVScale.h 	obgtkVScrollbar.h 	obgtkVSeparator.h 	obgtkViewport.h 	obgtkWidget.h 	obgtkWindow.h
 
 
-libobgtk_la_LDFLAGS = -version-info 3:1:2 -rpath $(libdir)
+libobgtk_la_LDFLAGS = -version-info 1:0:0
 libobgtk_la_LIBADD = $(GTK_LIBS)
 
 noinst_PROGRAMS = obgtk-test
