Commit 8b83f758 authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

Apply patch from peter@ximian.com (Peter Teichman), to generate config

Wed Feb 14 18:53:57 2001  George Lebl <jirka@5z.com>

	* configure.in, config/Makefile.am: Apply patch from peter@ximian.com
	  (Peter Teichman), to generate config files from .in files during
	  configure time, rather then install time

	* gdm.spec.in: update for the above
parent d1e3f75b
Wed Feb 14 18:53:57 2001 George Lebl <jirka@5z.com>
* configure.in, config/Makefile.am: Apply patch from peter@ximian.com
(Peter Teichman), to generate config files from .in files during
configure time, rather then install time
* gdm.spec.in: update for the above
Tue Feb 13 18:27:03 2001 George Lebl <jirka@5z.com>
* daemon/display.c: Apply fix from "Matthias Clasen"
......
......@@ -9,31 +9,6 @@ postdir = $(sysconfdir)/gdm/PostSession
predir = $(sysconfdir)/gdm/PreSession
gdm.conf: gdm.conf.in Makefile
sed -e 's,\@datadir\@,$(datadir),g' \
-e 's,\@pixmapdir\@,$(pixmapdir),g' \
-e 's,\@bindir\@,$(bindir),g' \
-e 's,\@sysconfdir\@,$(sysconfdir),g' \
-e 's,\@localedir\@,$(localedir),g' \
-e 's,\@authdir\@,$(authdir),g' \
< $(srcdir)/gdm.conf.in > gdm.conf.tmp; \
mv -f gdm.conf.tmp gdm.conf
Gnome: Gnome.in Makefile
sed -e 's,\@sysconfdir\@,$(sysconfdir),g' \
< $(srcdir)/Gnome.in > Gnome.tmp \
&& mv -f Gnome.tmp Gnome
Failsafe: Failsafe.in Makefile
sed -e 's,\@sessdir\@,$(sessdir),g' \
< $(srcdir)/Failsafe.in > Failsafe.tmp \
&& mv -f Failsafe.tmp Failsafe
gnomerc: gnomerc.in Makefile
sed -e 's,\@bindir\@,$(bindir),g' \
< $(srcdir)/gnomerc.in > gnomerc.tmp \
&& mv -f gnomerc.tmp gnomerc
noinst_DATA = gdm.conf
EXTRA_DIST = \
......
......@@ -134,6 +134,10 @@ AC_CHECK_HEADER(X11/extensions/Xinerama.h, [
AC_CHECK_LIB(Xinerama, XineramaQueryScreens,,, $GTK_LIBS)
])
pixmapdir=${datadir}/pixmaps
AC_SUBST(pixmapdir)
localedir=${sysconfdir}/gdm
AC_SUBST(localedir)
AC_OUTPUT([
Makefile
......@@ -146,6 +150,10 @@ docs/Makefile
docs/C/Makefile
po/Makefile.in
intl/Makefile
config/Failsafe
config/gdm.conf
config/Gnome
config/gnomerc
gdm.spec
],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
......
......@@ -37,7 +37,6 @@ several different X sessions on your local machine at the same time.
%build
CFLAGS="-g $RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir=/etc/X11 --localstatedir=/var
make
(cd config; make gdm.conf gnomerc Gnome Failsafe)
%install
rm -rf $RPM_BUILD_ROOT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment