2000-02-23 21:33:32 +01:00
|
|
|
--- control-center/Makefile.in.orig Tue Oct 5 16:45:56 1999
|
|
|
|
|
+++ control-center/Makefile.in Wed Feb 23 13:42:28 2000
|
|
|
|
|
@@ -131,7 +131,7 @@
|
1999-03-15 03:05:55 +01:00
|
|
|
cxxflags_set = @cxxflags_set@
|
|
|
|
|
l = @l@
|
|
|
|
|
|
|
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
|
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bin_PROGRAMS = gnomecc
|
2000-02-23 21:33:32 +01:00
|
|
|
@@ -154,16 +154,16 @@
|
1999-03-15 03:05:55 +01:00
|
|
|
|
|
|
|
|
EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA)
|
|
|
|
|
|
|
|
|
|
-sysdir = $(datadir)/gnome/apps/Settings
|
|
|
|
|
+sysdir = $(datadir)/apps/Settings
|
|
|
|
|
sys_DATA = gnomecc.desktop
|
|
|
|
|
|
|
|
|
|
-confexecdir = $(libdir)
|
|
|
|
|
+confexecdir = $(sysconfdir)
|
|
|
|
|
confexec_DATA = cappletConf.sh
|
|
|
|
|
|
|
|
|
|
libcapplet_la_SOURCES = capplet-widget.c capplet-widget-libs.c capplet-widget-libs.h $(CORBA_SRCLIST)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
|
|
|
|
|
+libcapplet_la_LDFLAGS = -version-info 1:0:0
|
|
|
|
|
libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
|
|
|
|
|
|
|
|
|
|
include_HEADERS = capplet-widget.h
|
2000-02-23 21:33:32 +01:00
|
|
|
@@ -561,6 +561,7 @@
|
|
|
|
|
-e 's?\@GNOMEUI_LIBS\@?$(GNOMEUI_LIBS)?g' \
|
|
|
|
|
-e 's?\@GNOME_INCLUDEDIR\@?$(GNOME_INCLUDEDIR)?g' \
|
|
|
|
|
-e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
|
|
|
|
|
+ -e 's?\@VERSION\@?$(VERSION)?g' \
|
|
|
|
|
< $(srcdir)/cappletConf.sh.in > cappletConf.tmp \
|
|
|
|
|
&& mv cappletConf.tmp cappletConf.sh
|
|
|
|
|
|
