E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
configure.in entrance.spec.in
Log Message:
Sat Mar 31 22:42:26 2007Michael Jennings (mej)
Fine. /usr/libexec then, but /usr/lib is still wrong.
--
===
RCS file: /cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- configure.in30 Mar 2007 20:06:49 - 1.69
+++ configure.in1 Apr 2007 02:42:28 - 1.70
@@ -20,8 +20,8 @@
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$PACKAGE_DATA_DIR", [Shared data
directory])
AC_EXPAND_DIR(PACKAGE_BIN_DIR, "$bindir")
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "$PACKAGE_BIN_DIR", [Location of binaries])
-AC_EXPAND_DIR(PACKAGE_LIB_DIR, "$libdir")
-AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "$PACKAGE_LIB_DIR", [Location of
libraries])
+AC_EXPAND_DIR(PACKAGE_LIBEXEC_DIR, "$libexecdir")
+AC_DEFINE_UNQUOTED(PACKAGE_LIBEXEC_DIR, "$PACKAGE_LIBEXEC_DIR", [Location of
private executables])
# Override autosplat's destination dir settings
if test $sysconfdir = '${prefix}/etc'; then
===
RCS file: /cvs/e/e17/apps/entrance/entrance.spec.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- entrance.spec.in1 Apr 2007 00:28:57 - 1.9
+++ entrance.spec.in1 Apr 2007 02:42:29 - 1.10
@@ -47,9 +47,10 @@
%{_sysconfdir}/init.d/entrance
%{_sysconfdir}/pam.d/entrance
%{_bindir}/entrance*
+%{_sbindir}/entrance*
%{_includedir}/*.h
%{_libdir}/libentrance*
-%{_libdir}/entrance
+%{_libexecdir}/entrance
%{_datadir}/%{name}
%{_var}/run/%{name}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: Makefile.am entrance_session.c Log Message: Sat Mar 31 22:42:26 2007Michael Jennings (mej) Fine. /usr/libexec then, but /usr/lib is still wrong. -- === RCS file: /cvs/e/e17/apps/entrance/src/client/Makefile.am,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- Makefile.am 1 Apr 2007 00:28:57 - 1.25 +++ Makefile.am 1 Apr 2007 02:42:29 - 1.26 @@ -4,12 +4,12 @@ INCLUDES = @EDJE_CFLAGS@ @ECORE_CFLAGS@ @EVAS_CFLAGS@ \ @ESMART_CFLAGS@ -entrancelibdir = $(libdir)/$(PACKAGE) +entrancelibexecdir = $(libexecdir)/$(PACKAGE) #bin_PROGRAMS = entrance entrance_edit bin_PROGRAMS = entrance -entrancelib_PROGRAMS = entrance_login +entrancelibexec_PROGRAMS = entrance_login entrance_SOURCES = \ entrance_auth.c entrance_auth.h \ === RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_session.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -3 -r1.92 -r1.93 --- entrance_session.c 3 Nov 2006 14:36:45 - 1.92 +++ entrance_session.c 1 Apr 2007 02:42:29 - 1.93 @@ -389,7 +389,7 @@ char *user = NULL; char *session_cmd = NULL; char *session_name = NULL; - char *monitor_cmd = PACKAGE_LIB_DIR "/" PACKAGE "/entrance_login"; + char *monitor_cmd = PACKAGE_LIBEXEC_DIR "/" PACKAGE "/entrance_login"; struct passwd *pwent = NULL; Entrance_X_Session *exs = NULL; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec.in
Log Message:
Sat Mar 31 13:27:09 2007Michael Jennings (mej)
The FHS specifies superuser binaries go in /sbin, NOT /usr/lib.
--
===
RCS file: /cvs/e/e17/apps/entrance/entrance.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- entrance.spec.in31 Mar 2007 13:07:12 - 1.7
+++ entrance.spec.in31 Mar 2007 17:27:11 - 1.8
@@ -49,7 +49,7 @@
%{_bindir}/entrance*
%{_includedir}/*.h
%{_libdir}/libentrance*
-%{_libdir}/entrance
+%{_sbindir}/entrance*
%{_datadir}/%{name}
%{_var}/run/%{name}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/debian Modified Files: entrance.install Log Message: Sat Mar 31 13:27:09 2007Michael Jennings (mej) The FHS specifies superuser binaries go in /sbin, NOT /usr/lib. -- === RCS file: /cvs/e/e17/apps/entrance/debian/entrance.install,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- entrance.install31 Mar 2007 13:07:12 - 1.3 +++ entrance.install31 Mar 2007 17:27:11 - 1.4 @@ -5,4 +5,4 @@ debian/tmp/usr/bin/entrance debian/tmp/usr/bin/entrance_edit debian/tmp/usr/bin/entrance_wrapper -debian/tmp/usr/lib/entrance/* +debian/tmp/usr/sbin/* - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: Makefile.am Log Message: Sat Mar 31 13:27:09 2007Michael Jennings (mej) The FHS specifies superuser binaries go in /sbin, NOT /usr/lib. -- === RCS file: /cvs/e/e17/apps/entrance/src/client/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- Makefile.am 31 Mar 2007 13:07:12 - 1.23 +++ Makefile.am 31 Mar 2007 17:27:11 - 1.24 @@ -4,12 +4,10 @@ INCLUDES = @EDJE_CFLAGS@ @ECORE_CFLAGS@ @EVAS_CFLAGS@ \ @ESMART_CFLAGS@ -entrancelibdir = $(libdir)/$(PACKAGE) - #bin_PROGRAMS = entrance entrance_edit bin_PROGRAMS = entrance -entrancelib_PROGRAMS = entrance_login +sbin_PROGRAMS = entrance_login entrance_SOURCES = \ entrance_auth.c entrance_auth.h \ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
configure.in
Log Message:
Fri Mar 30 16:06:47 2007Michael Jennings (mej)
Patch from Glen Larsen <[EMAIL PROTECTED]> to force sysconfdir expansion.
--
===
RCS file: /cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- configure.in22 Mar 2007 02:17:28 - 1.68
+++ configure.in30 Mar 2007 20:06:49 - 1.69
@@ -34,7 +34,8 @@
fi
test $localstatedir = '${prefix}/var' && localstatedir="/var/run/${PACKAGE}"
-AC_DEFINE_UNQUOTED(PACKAGE_CFG_DIR, "${sysconfdir}", [Config data directory])
+AC_EXPAND_DIR(PACKAGE_CFG_DIR, "$sysconfdir")
+AC_DEFINE_UNQUOTED(PACKAGE_CFG_DIR, "$PACKAGE_CFG_DIR", [Config data
directory])
AC_DEFINE_UNQUOTED(PACKAGE_STATE_DIR, "${localstatedir}", [State data
directory])
dnl Set PACKAGE_SOURCE_DIR in config.h.
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/daemon
Modified Files:
entranced_display.c spawner.c
Log Message:
Tue Mar 13 13:38:28 2007Michael Jennings (mej)
Cleanup ridiculous use of strstr().
--
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/entranced_display.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entranced_display.c 26 Oct 2006 08:05:56 - 1.5
+++ entranced_display.c 13 Mar 2007 23:38:42 - 1.6
@@ -30,6 +30,7 @@
d->xprog = ecore_config_string_get("/entranced/xserver");
d->attempts = ecore_config_int_get("/entranced/attempts");
+ d->dispnum = 0;
d->status = NOT_RUNNING;
d->auth_en = 1;
d->auths = ecore_list_new();
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/spawner.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- spawner.c 13 Mar 2007 23:19:39 - 1.37
+++ spawner.c 13 Mar 2007 23:38:42 - 1.38
@@ -128,11 +128,9 @@
if (!d->name)
d->name = strdup(X_DISP);
- str = strstr(d->name, ":");
+ str = strchr(d->name, ':');
- if (!str || str >= (d->name + strlen(d->name) - 1))
- d->dispnum = 0;
- else
+ if (str)
d->dispnum = atoi(str + 1);
entranced_debug("entranced: main: display number is %d\n", d->dispnum);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: Makefile.am Log Message: Tue Mar 13 13:14:28 2007Michael Jennings (mej) Fix "make distcheck" by replacing $sysconfdir with a value that doesn't contain $prefix if, and only if, $prefix is /usr or /usr/local. Otherwise, the user must specify --sysconfdir if they want configuration outside $prefix. Use AC_PATH_PROG() to determine $xbin value. Fix init script to work with LSB-standard chkconfig. Move IPC socket and PID file to proper location in /var/run, not in /var or /var/lib. entrance_login belongs in sbin. entrance_wrapper belongs in bin. NEITHER belongs in /usr/lib, though /usr/libexec might be acceptable. Re-enabled verbose mode for debugging. Added -debug option to force launching of Xnest instead of the configured X server. FYI, this version fixes the messed up startup size, at least for me. -- === RCS file: /cvs/e/e17/apps/entrance/src/client/Makefile.am,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- Makefile.am 13 Aug 2006 04:18:27 - 1.21 +++ Makefile.am 13 Mar 2007 23:19:39 - 1.22 @@ -4,12 +4,10 @@ INCLUDES = @EDJE_CFLAGS@ @ECORE_CFLAGS@ @EVAS_CFLAGS@ \ @ESMART_CFLAGS@ -entrancelibdir = $(libdir)/$(PACKAGE) - #bin_PROGRAMS = entrance entrance_edit bin_PROGRAMS = entrance -entrancelib_PROGRAMS = entrance_login +sbin_PROGRAMS = entrance_login entrance_SOURCES = \ entrance_auth.c entrance_auth.h \ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/config/init.d Modified Files: entrance.in Log Message: Tue Mar 13 13:14:28 2007Michael Jennings (mej) Fix "make distcheck" by replacing $sysconfdir with a value that doesn't contain $prefix if, and only if, $prefix is /usr or /usr/local. Otherwise, the user must specify --sysconfdir if they want configuration outside $prefix. Use AC_PATH_PROG() to determine $xbin value. Fix init script to work with LSB-standard chkconfig. Move IPC socket and PID file to proper location in /var/run, not in /var or /var/lib. entrance_login belongs in sbin. entrance_wrapper belongs in bin. NEITHER belongs in /usr/lib, though /usr/libexec might be acceptable. Re-enabled verbose mode for debugging. Added -debug option to force launching of Xnest instead of the configured X server. FYI, this version fixes the messed up startup size, at least for me. -- === RCS file: /cvs/e/e17/apps/entrance/config/init.d/entrance.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- entrance.in 3 Nov 2006 14:36:45 - 1.6 +++ entrance.in 13 Mar 2007 23:19:39 - 1.7 @@ -2,9 +2,9 @@ # # Originally based on: gdm /etc/init.d script on debian # -# THIS DOESN'T WORK YET atmos - May 6, 2002 -# THIS DOES WORK! atmos - May 27, 2002 -# THIS WORKS WITH LSB! azundris - May 23, 2004 +# chkconfig: - 99 01 +# description: Entrance Display Manager +# probe: true # /etc/init.d/entrance # @@ -15,7 +15,7 @@ # Required-Stop: # Default-Start: 5 # Default-Stop: -# Description: X Display Manager +# Description: Entrance Display Manager ### END INIT INFO set -e @@ -23,7 +23,7 @@ # HEED_DEFAULT_DISPLAY_MANAGER to "false." PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin [EMAIL PROTECTED]@/sbin/entranced -PIDFILE=/var/run/entranced.pid +PIDFILE=/var/run/entrance/entranced.pid test -x $DAEMON || exit 0 - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: Makefile.am Log Message: Tue Mar 13 13:14:28 2007Michael Jennings (mej) Fix "make distcheck" by replacing $sysconfdir with a value that doesn't contain $prefix if, and only if, $prefix is /usr or /usr/local. Otherwise, the user must specify --sysconfdir if they want configuration outside $prefix. Use AC_PATH_PROG() to determine $xbin value. Fix init script to work with LSB-standard chkconfig. Move IPC socket and PID file to proper location in /var/run, not in /var or /var/lib. entrance_login belongs in sbin. entrance_wrapper belongs in bin. NEITHER belongs in /usr/lib, though /usr/libexec might be acceptable. Re-enabled verbose mode for debugging. Added -debug option to force launching of Xnest instead of the configured X server. FYI, this version fixes the messed up startup size, at least for me. -- === RCS file: /cvs/e/e17/apps/entrance/data/config/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 13 Aug 2006 04:18:26 - 1.6 +++ Makefile.am 13 Mar 2007 23:19:39 - 1.7 @@ -1,13 +1,12 @@ -MAINTAINERCLEANFILES = Makefile.in - DB = entrance_config.cfg SCRIPT = build_config.sh CLEANFILES = $(DB) -EXTRA_DIST = $(SCRIPT) +MAINTAINERCLEANFILES = Makefile.in + +sysconf_DATA = $(DB) -configdbdir = $(sysconfdir) -configdb_DATA = $(DB) +EXTRA_DIST = $(SCRIPT) all: $(DB) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
configure.in entrance.spec.in
Log Message:
Tue Mar 13 13:14:28 2007Michael Jennings (mej)
Fix "make distcheck" by replacing $sysconfdir with a value that
doesn't contain $prefix if, and only if, $prefix is /usr or
/usr/local. Otherwise, the user must specify --sysconfdir if they
want configuration outside $prefix.
Use AC_PATH_PROG() to determine $xbin value.
Fix init script to work with LSB-standard chkconfig.
Move IPC socket and PID file to proper location in /var/run, not in
/var or /var/lib.
entrance_login belongs in sbin. entrance_wrapper belongs in bin.
NEITHER belongs in /usr/lib, though /usr/libexec might be acceptable.
Re-enabled verbose mode for debugging.
Added -debug option to force launching of Xnest instead of the
configured X server.
FYI, this version fixes the messed up startup size, at least for me.
--
===
RCS file: /cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- configure.in29 Aug 2006 00:29:38 - 1.65
+++ configure.in13 Mar 2007 23:19:39 - 1.66
@@ -18,14 +18,21 @@
AC_EXPAND_DIR(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$PACKAGE_DATA_DIR", [Shared data
directory])
-AC_EXPAND_DIR(PACKAGE_LIB_DIR, "$bindir")
+AC_EXPAND_DIR(PACKAGE_BIN_DIR, "$bindir")
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "$PACKAGE_BIN_DIR", [Location of binaries])
AC_EXPAND_DIR(PACKAGE_LIB_DIR, "$libdir")
AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "$PACKAGE_LIB_DIR", [Location of
libraries])
# Override autosplat's destination dir settings
-test $sysconfdir = '${prefix}/etc' && sysconfdir="/etc"
-test $localstatedir = '${prefix}/var' && localstatedir="/var/lib/${PACKAGE}"
+if test $sysconfdir = '${prefix}/etc'; then
+if test $prefix = '/usr' -o $prefix = '/usr/local'; then
+# "make distcheck" does weird shit with $prefix without properly
+# setting DESTDIR, at least with some autoSPLAT versions. So only
+# reset this if we're installing to /usr or /usr/local.
+sysconfdir="/etc"
+fi
+fi
+test $localstatedir = '${prefix}/var' && localstatedir="/var/run/${PACKAGE}"
AC_DEFINE_UNQUOTED(PACKAGE_CFG_DIR, "${sysconfdir}", [Config data directory])
AC_DEFINE_UNQUOTED(PACKAGE_STATE_DIR, "${localstatedir}", [State data
directory])
@@ -42,7 +49,8 @@
[
xbin="$withval"
], [
-xbin="/usr/X11R6/bin";
+AC_PATH_PROG(xbin, X, /usr/X11R6/bin,
$PATH:/usr/X11R6/bin:/usr/X11R7/bin)
+xbin=`dirname $xbin`
])
AC_DEFINE_UNQUOTED(X_BINARIES, "${xbin}", [Path to X binaries])
AC_SUBST(xbin)
===
RCS file: /cvs/e/e17/apps/entrance/entrance.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entrance.spec.in26 Feb 2007 01:07:36 - 1.5
+++ entrance.spec.in13 Mar 2007 23:19:39 - 1.6
@@ -29,6 +29,7 @@
%install
%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
test -d ${HOME:-/tmp}/.ecore && %{__rm} -rf ${HOME:-/tmp}/.ecore || :
+%{__mkdir_p} $RPM_BUILD_ROOT%{_var}/run/%{name}
%post
/sbin/ldconfig || :
@@ -48,9 +49,8 @@
%{_bindir}/entrance*
%{_includedir}/*.h
%{_libdir}/libentrance*
-%{_libdir}/entrance/entrance_login
-%{_libdir}/entrance/entrance_wrapper
-%{_sbindir}/entranced
+%{_sbindir}/entrance*
%{_datadir}/%{name}
+%{_var}/run/%{name}
%changelog
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/daemon
Modified Files:
Entranced.h Makefile.am spawner.c util.c util.h
Log Message:
Tue Mar 13 13:14:28 2007Michael Jennings (mej)
Fix "make distcheck" by replacing $sysconfdir with a value that
doesn't contain $prefix if, and only if, $prefix is /usr or
/usr/local. Otherwise, the user must specify --sysconfdir if they
want configuration outside $prefix.
Use AC_PATH_PROG() to determine $xbin value.
Fix init script to work with LSB-standard chkconfig.
Move IPC socket and PID file to proper location in /var/run, not in
/var or /var/lib.
entrance_login belongs in sbin. entrance_wrapper belongs in bin.
NEITHER belongs in /usr/lib, though /usr/libexec might be acceptable.
Re-enabled verbose mode for debugging.
Added -debug option to force launching of Xnest instead of the
configured X server.
FYI, this version fixes the messed up startup size, at least for me.
--
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/Entranced.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Entranced.h 1 Aug 2006 04:38:19 - 1.16
+++ Entranced.h 13 Mar 2007 23:19:39 - 1.17
@@ -20,10 +20,10 @@
#define ENTRANCED_DEBUG 1
#define DEFAULT_X_SERVER X_BINARIES "/X -quiet -nolisten tcp" ENTRANCE_VT_ARG
-//#define X_SERVER "/usr/X11R6/bin/Xnest -full"
+#define DEBUG_X_SERVER X_BINARIES "/Xnest"
#define X_DISP ":0" /* only used if DISPLAY variable is NOT set */
-#define ENTRANCE PACKAGE_LIB_DIR "/" PACKAGE "/entrance_wrapper"
-#define PIDFILE "/var/run/entranced.pid"
+#define ENTRANCE PACKAGE_BIN_DIR "/entrance_wrapper"
+#define PIDFILE PACKAGE_STATE_DIR "/entranced.pid"
/* display->status possible values */
#define NOT_RUNNING 0
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- Makefile.am 13 Aug 2006 04:18:28 - 1.24
+++ Makefile.am 13 Mar 2007 23:19:39 - 1.25
@@ -3,10 +3,8 @@
INCLUDES = @X_CFLAGS@ @ECORE_CFLAGS@
-entrancelibdir = $(libdir)/$(PACKAGE)
-
sbin_PROGRAMS = entranced
-entrancelib_SCRIPTS = entrance_wrapper
+bin_SCRIPTS = entrance_wrapper
entranced_SOURCES = \
Entranced.h \
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/spawner.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- spawner.c 26 Oct 2006 08:05:56 - 1.36
+++ spawner.c 13 Mar 2007 23:19:39 - 1.37
@@ -41,20 +41,15 @@
/* This should probably in a separate usage function, but bleh */
printf("Entranced - Launcher for the Entrance Display Manager\n");
printf("Usage: %s [OPTION] ...\n\n", name);
- printf
-
("--\n");
+
printf("--\n");
printf(" -c CONFIG Specify config file for greeter\n");
printf(" -d DISPLAY Connect to an existing X server\n");
printf(" -help Display this help message\n");
- /* printf(" -verbose Display extra debugging info\n"); */
- printf
- (" -nodaemon Don't fork to background (useful for init
scripts)\n");
- printf
-
("==\n\n");
- printf
- ("Note: if you're launching Entrance from within an existing X session,
don't\n");
- printf
- ("try to use entranced or you may get unexpected results. Instead,
launch\n");
+ printf(" -verbose Display extra debugging info\n");
+ printf(" -nodaemon Don't fork to background (useful for init
scripts)\n");
+
printf("==\n\n");
+ printf("Note: if you're launching Entrance from within an existing X
session, don't\n");
+ printf("try to use entranced or you may get unexpected results. Instead,
launch\n");
printf("entrance directly by typing \"entrance\".\n\n");
exit(0);
}
@@ -77,6 +72,7 @@
{"help", 0, 0, 'h'},
{"disable-xauth", 0, 0, 'a'},
{"verbose", 0, 0, 'v'},
+ {"debug", 0, 0, 'D'},
{0, 0, 0, 0}
};
pid_t entranced_pid = getpid();
@@ -99,7 +95,7 @@
/* Parse command-line options */
while (1)
{
- c = getopt_long_only(argc, argv, "c:d:nhv", d_opt, NULL);
+ c = getopt_long_only(argc, argv, "c:d:nhvD", d_opt, NULL);
if (c == -1)
break;
switch (c)
@@ -118,8 +114,14 @@
break;
case 'h':
usage(argv[0]);
-
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: entrance.spec.in Log Message: Sun Feb 25 14:07:34 2007Michael Jennings (mej) Sigh. -- === RCS file: /cvs/e/e17/apps/entrance/entrance.spec.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- entrance.spec.in26 Feb 2007 01:04:52 - 1.4 +++ entrance.spec.in26 Feb 2007 01:07:36 - 1.5 @@ -1,7 +1,7 @@ Summary: enlightened display manager Name: @PACKAGE@ Version: @VERSION@ -Release: 1.20070201 +Release: 0.%(date '+%Y%m%d') License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec.in
Log Message:
Sun Feb 25 14:04:50 2007Michael Jennings (mej)
Require ecore-bin.
--
===
RCS file: /cvs/e/e17/apps/entrance/entrance.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- entrance.spec.in8 Dec 2006 01:03:02 - 1.3
+++ entrance.spec.in26 Feb 2007 01:04:52 - 1.4
@@ -1,7 +1,7 @@
Summary: enlightened display manager
Name: @PACKAGE@
Version: @VERSION@
-Release: 0.%(date '+%Y%m%d')
+Release: 1.20070201
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org/
@@ -11,7 +11,7 @@
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: xorg-x11-xdm, XFree86-xdm
BuildRequires: libjpeg-devel, zlib-devel, /etc/X11/xdm/Xsession
-BuildRequires: ecore-devel, edje-devel, esmart-devel
+BuildRequires: ecore-bin, ecore-devel, edje-devel, esmart-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec.in
Log Message:
Thu Dec 7 20:03:01 2006Michael Jennings (mej)
Build fixes. Still doesn't pass 'make distcheck'. :(
--
===
RCS file: /cvs/e/e17/apps/entrance/entrance.spec.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- entrance.spec.in6 May 2006 08:05:15 - 1.2
+++ entrance.spec.in8 Dec 2006 01:03:02 - 1.3
@@ -45,8 +45,9 @@
%{_sysconfdir}/entrance_config.cfg
%{_sysconfdir}/init.d/entrance
%{_sysconfdir}/pam.d/entrance
-%{_bindir}/entrance
-%{_bindir}/entrance_edit
+%{_bindir}/entrance*
+%{_includedir}/*.h
+%{_libdir}/libentrance*
%{_libdir}/entrance/entrance_login
%{_libdir}/entrance/entrance_wrapper
%{_sbindir}/entranced
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/config Modified Files: Makefile.am Log Message: Thu Dec 7 20:03:01 2006Michael Jennings (mej) Build fixes. Still doesn't pass 'make distcheck'. :( -- === RCS file: /cvs/e/e17/apps/entrance/src/config/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 13 Aug 2006 04:18:28 - 1.2 +++ Makefile.am 8 Dec 2006 01:03:02 - 1.3 @@ -1,11 +1,11 @@ ## Process this file with automake to produce Makefile.in MAINTAINERCLEANFILES = Makefile.in -INCLUDES = @X_CFLAGS@ @ECORE_CFLAGS@ +INCLUDES = @X_CFLAGS@ @ECORE_CFLAGS@ -I$(srcdir)/../lib bin_PROGRAMS=entrance_edit entrance_edit_SOURCES = ../daemon/Entranced.h entrance_edit_main.c ../lib/Entrance_Edit.h entrance_edit_LDADD = @ECORE_LIBS@ -lentrance_edit -entrance_edit_CFLAGS = @ECORE_CFLAGS@ -I../lib +entrance_edit_CFLAGS = @ECORE_CFLAGS@ entrance_edit_LDFLAGS= -L../lib - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_session.c
Log Message:
Wed Apr 5 12:28:52 2006Michael Jennings (mej)
Patch from Essien Essien <[EMAIL PROTECTED]> to allow changing of X
server path.
--
===
RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- entrance_session.c 10 Dec 2005 05:55:09 - 1.80
+++ entrance_session.c 5 Apr 2006 16:29:51 - 1.81
@@ -1,3 +1,4 @@
+#include "config.h"
#include "entrance.h"
#include "entrance_session.h"
#include
@@ -403,7 +404,7 @@
{
printf("Would have executed: %s\n", buf);
fflush(stdout);
- snprintf(buf, PATH_MAX, "/usr/X11R6/bin/xterm");
+ snprintf(buf, PATH_MAX, X_BINARIES"/xterm");
}
syslog(LOG_INFO, "Executing %s", buf);
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: build_config.sh.in Log Message: Wed Apr 5 12:28:52 2006Michael Jennings (mej) Patch from Essien Essien <[EMAIL PROTECTED]> to allow changing of X server path. -- === RCS file: /cvs/e/e17/apps/entrance/data/config/build_config.sh.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- build_config.sh.in 31 Mar 2006 03:36:18 - 1.19 +++ build_config.sh.in 5 Apr 2006 16:29:51 - 1.20 @@ -50,5 +50,5 @@ ecore_config -c $DB -k /entrance/presel/mode -i 1 # for Entranced -ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten [EMAIL PROTECTED]@" +ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten [EMAIL PROTECTED]@" ecore_config -c $DB -k /entranced/attempts -i 5 --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/daemon Modified Files: Entranced.h Log Message: Wed Apr 5 12:28:52 2006Michael Jennings (mej) Patch from Essien Essien <[EMAIL PROTECTED]> to allow changing of X server path. -- === RCS file: /cvs/e/e17/apps/entrance/src/daemon/Entranced.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- Entranced.h 31 Mar 2006 03:36:18 - 1.11 +++ Entranced.h 5 Apr 2006 16:29:51 - 1.12 @@ -19,7 +19,7 @@ #define ENTRANCED_DEBUG 1 -#define DEFAULT_X_SERVER "/usr/X11R6/bin/X -quiet -nolisten tcp" ENTRANCE_VT_ARG +#define DEFAULT_X_SERVER X_BINARIES "/X -quiet -nolisten tcp" ENTRANCE_VT_ARG //#define X_SERVER "/usr/X11R6/bin/Xnest -full" #define X_DISP ":0" /* only used if DISPLAY variable is NOT set */ #define ENTRANCE PREFIX "/bin/entrance_wrapper" --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
configure.in
Log Message:
Wed Apr 5 12:28:52 2006Michael Jennings (mej)
Patch from Essien Essien <[EMAIL PROTECTED]> to allow changing of X
server path.
--
===
RCS file: /cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- configure.in1 Apr 2006 01:51:56 - 1.52
+++ configure.in5 Apr 2006 16:29:50 - 1.53
@@ -31,6 +31,18 @@
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Program source
directory])
+dnl Set path to X_BINARIES in config.h
+dnl# FIXME: Use AC_PATH_PROG macro here.
+xbin=""
+AC_ARG_WITH(xbin, [ --with-xbin=DIRDirectory where X binaries are
installed ],
+[
+xbin="$withval"
+], [
+xbin="/usr/X11R6/bin";
+])
+AC_DEFINE_UNQUOTED(X_BINARIES, "${xbin}", [Path to X binaries])
+AC_SUBST(xbin)
+
dnl Use -Wall if we have gcc.
changequote(,)dnl
if test "x$GCC" = "xyes"; then
@@ -240,6 +252,7 @@
echo "Support for shadow authentication ... $have_shadow"
echo "Support for PAM authentication .. $have_pam"
echo "XSession file to use $xsession "
+echo "X binaries prefix .. $xbin"
echo
echo "Now type 'make' (gmake on some systems) to compile $PACKAGE"
echo
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/daemon Modified Files: entrance_wrapper.in Log Message: Fri Mar 31 20:49:36 2006Michael Jennings (mej) Fixed autogen error due to leftover output file. Added auto-fu for optional runtime copying of PAM config from other display managers automatically, a specific display manager, or stick with the one shipped with entrance. -- === RCS file: /cvs/e/e17/apps/entrance/src/daemon/entrance_wrapper.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- entrance_wrapper.in 31 Jan 2003 21:57:06 - 1.1 +++ entrance_wrapper.in 1 Apr 2006 01:51:56 - 1.2 @@ -5,6 +5,8 @@ test -f /etc/profile && . /etc/profile [EMAIL PROTECTED]@ + exec @prefix@/bin/entrance "$@" #fallback --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/config/init.d Modified Files: entrance.in Log Message: Fri Mar 31 20:49:36 2006Michael Jennings (mej) Fixed autogen error due to leftover output file. Added auto-fu for optional runtime copying of PAM config from other display managers automatically, a specific display manager, or stick with the one shipped with entrance. -- === RCS file: /cvs/e/e17/apps/entrance/config/init.d/entrance.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- entrance.in 13 Mar 2006 17:12:36 - 1.4 +++ entrance.in 1 Apr 2006 01:51:56 - 1.5 @@ -30,6 +30,7 @@ case "$1" in start) echo -n "Becoming entranced: entrance" +@PAM_CONFIG@ $DAEMON echo "." ;; --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
configure.in
Log Message:
Fri Mar 31 20:49:36 2006Michael Jennings (mej)
Fixed autogen error due to leftover output file.
Added auto-fu for optional runtime copying of PAM config from other
display managers automatically, a specific display manager, or stick
with the one shipped with entrance.
--
===
RCS file: /cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- configure.in31 Mar 2006 03:36:18 - 1.51
+++ configure.in1 Apr 2006 01:51:56 - 1.52
@@ -98,7 +98,7 @@
fi
AC_ARG_WITH(auth_mode,
-[ --with-auth-mode=AUTHMODE Specify the default authentication mode (pam
or shadow)],
+[ --with-auth-mode=AUTHMODE Specify the default authentication mode (pam
or shadow)],
[
if test "x$withval" = "xshadow"; then
auth_mode=2
@@ -108,10 +108,43 @@
AC_SUBST(auth_mode)
+AC_MSG_CHECKING([for pam configuration source])
+AC_ARG_WITH(pam-config, [ --with-pam-config=SRC Specify PAM config source
(entrance, gdm, xdm, etc. or "auto")],
+[
+if test "x$have_pam" = "yes"; then
+AC_MSG_RESULT([N/A, pam disabled])
+PAM_CONFIG=entrance
+elif test "x$withval" = "xauto"; then
+AC_MSG_RESULT([runtime auto-detect])
+PAM_CONFIG=auto
+elif test "x$withval" = "xyes"; then
+AC_MSG_ERROR([Parameter to --with-pam-config required.])
+elif test "x$withval" = "xno"; then
+AC_MSG_RESULT([disabled])
+PAM_CONFIG=entrance
+else
+AC_MSG_RESULT([$withval])
+PAM_CONFIG="$withval"
+fi
+], [
+AC_MSG_RESULT([runtime auto-detect])
+PAM_CONFIG=auto
+])
+if test "x$PAM_CONFIG" = "x"; then
+PAM_CONFIG=:
+elif test "x$PAM_CONFIG" = "xentrance"; then
+PAM_CONFIG=:
+elif test "x$PAM_CONFIG" = "xauto"; then
+PAM_CONFIG='(cd '"${sysconfdir}"'/pam.d ; for i in gdm kdm wdm xdm ; do
test -s $i && cp -a $i entrance && break ; done)'
+else
+PAM_CONFIG="(cd ${sysconfdir}/pam.d ; cp -a $PAM_CONFIG entrance)"
+fi
+AC_SUBST(PAM_CONFIG)
+
# what Xsession file we're using
xsession=/etc/X11/xdm/Xsession
AC_ARG_WITH(xsession,
- [ --with-xsession=PATH Specify the location of system Xsession file],
+ [ --with-xsession=PATHSpecify the location of system Xsession
file],
[
if test "x$withval" != "xno" ; then
xsession=$withval
@@ -134,7 +167,7 @@
edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc"
AC_ARG_WITH(edje-cc,
-[ --with-edje-cc=PATH specify a specific path to edje_cc],
+[ --with-edje-cc=PATH Specify a specific path to edje_cc],
[
v=$withval;
edje_cc=$v
@@ -145,7 +178,7 @@
AC_SUBST(edje_cc)
AC_MSG_CHECKING([for virtual console for X startup])
-AC_ARG_WITH(vt, [ --with-vt=NUM Specify on which virtual console to start X
(default 7)],
+AC_ARG_WITH(vt, [ --with-vt=NUM Specify on which virtual console to
start X (default 7)],
[
if (test $withval -ge 0) >/dev/null 2>&1; then
AC_MSG_RESULT([$withval])
@@ -176,7 +209,6 @@
data/Makefile
data/config/Makefile
data/config/build_config.sh
-data/config/autodetect.sh
data/fonts/Makefile
data/images/Makefile
data/images/sessions/Makefile
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/daemon Modified Files: Entranced.h Log Message: Thu Mar 30 22:36:22 2006Michael Jennings (mej) Added parameter to specify VC or auto-detect. -- === RCS file: /cvs/e/e17/apps/entrance/src/daemon/Entranced.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Entranced.h 9 Dec 2005 14:00:11 - 1.10 +++ Entranced.h 31 Mar 2006 03:36:18 - 1.11 @@ -19,7 +19,7 @@ #define ENTRANCED_DEBUG 1 -#define DEFAULT_X_SERVER "/usr/X11R6/bin/X -quiet -nolisten tcp" +#define DEFAULT_X_SERVER "/usr/X11R6/bin/X -quiet -nolisten tcp" ENTRANCE_VT_ARG //#define X_SERVER "/usr/X11R6/bin/Xnest -full" #define X_DISP ":0" /* only used if DISPLAY variable is NOT set */ #define ENTRANCE PREFIX "/bin/entrance_wrapper" --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: Makefile.am configure.in Log Message: Thu Mar 30 22:36:22 2006Michael Jennings (mej) Added parameter to specify VC or auto-detect. -- === RCS file: /cvs/e/e17/apps/entrance/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 22 Mar 2006 19:11:10 - 1.10 +++ Makefile.am 31 Mar 2006 03:36:18 - 1.11 @@ -21,6 +21,3 @@ if test -d data; then \ (cd $(srcdir); tar -cf - data) | (cd $(distdir); tar -xf -) \ fi - -install-data-am: - sh data/config/autodetect.sh || : === RCS file: /cvs/e/e17/apps/entrance/configure.in,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- configure.in29 Mar 2006 08:00:28 - 1.50 +++ configure.in31 Mar 2006 03:36:18 - 1.51 @@ -144,6 +144,24 @@ ]) AC_SUBST(edje_cc) +AC_MSG_CHECKING([for virtual console for X startup]) +AC_ARG_WITH(vt, [ --with-vt=NUM Specify on which virtual console to start X (default 7)], +[ +if (test $withval -ge 0) >/dev/null 2>&1; then +AC_MSG_RESULT([$withval]) +ENTRANCE_VT_ARG=" vt$withval" +elif test "x$withval" = "xauto"; then +AC_MSG_RESULT([X autodetect]) +ENTRANCE_VT_ARG="" +else +AC_MSG_ERROR([Parameter to --with-vt must be numeric or "auto"]) +fi +], [ +ENTRANCE_VT_ARG=" vt7" +AC_MSG_RESULT([7 (default)]) +]) +AC_DEFINE_UNQUOTED([ENTRANCE_VT_ARG], ["$ENTRANCE_VT_ARG"], [vtXX parameter to pass to X on startup]) +AC_SUBST([ENTRANCE_VT_ARG]) AC_OUTPUT([ Makefile --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: build_config.sh.in Removed Files: autodetect.sh.in Log Message: Thu Mar 30 22:36:22 2006Michael Jennings (mej) Added parameter to specify VC or auto-detect. -- === RCS file: /cvs/e/e17/apps/entrance/data/config/build_config.sh.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- build_config.sh.in 17 Dec 2005 00:50:45 - 1.18 +++ build_config.sh.in 31 Mar 2006 03:36:18 - 1.19 @@ -50,5 +50,5 @@ ecore_config -c $DB -k /entrance/presel/mode -i 1 # for Entranced -ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp" +ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten [EMAIL PROTECTED]@" ecore_config -c $DB -k /entranced/attempts -i 5 --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: Makefile.am configure.in Added Files: entrance.spec.in Removed Files: entrance.spec Log Message: Wed Mar 22 14:10:57 2006Michael Jennings (mej) Build and spec fixes. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 7 Mar 2006 18:13:58 - 1.9 +++ Makefile.am 22 Mar 2006 19:11:10 - 1.10 @@ -10,7 +10,7 @@ debian/entrance.postrm debian/entrance.prerm \ debian/entrance.conffiles debian/entrance.config \ m4/ac_expand_dir.m4 m4/ac_path_generic.m4 \ - debian/entrance.templates + debian/entrance.templates entrance.spec.in MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ @@ -23,4 +23,4 @@ fi install-data-am: - sh data/config/autodetect.sh + sh data/config/autodetect.sh || : === RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- configure.in17 Mar 2006 09:18:13 - 1.48 +++ configure.in22 Mar 2006 19:11:10 - 1.49 @@ -178,6 +178,7 @@ data/themes/taillights/programs/Makefile data/themes/taillights/images/Makefile data/themes/taillights/fonts/Makefile +entrance.spec debian/changelog ]) --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: Makefile.am Log Message: Wed Mar 22 14:10:57 2006Michael Jennings (mej) Build and spec fixes. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/config/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 16 Aug 2005 04:04:04 - 1.4 +++ Makefile.am 22 Mar 2006 19:11:10 - 1.5 @@ -10,4 +10,4 @@ all: $(DB) $(DB): $(SCRIPT) - sh $< + sh $< || : --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: entrance.spec Log Message: Fri Jan 20 17:22:22 2006Michael Jennings (mej) Updates for ecore changes. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- entrance.spec 28 Dec 2005 05:27:34 - 1.13 +++ entrance.spec 20 Jan 2006 22:14:26 - 1.14 @@ -1,6 +1,6 @@ Summary: enlightened display manager Name: entrance -Version: 0.9.0.004 +Version: 0.9.0.005 Release: 0.%(date '+%Y%m%d') License: BSD Group: System Environment/Libraries --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Wed Dec 28 00:35:31 2005Michael Jennings (mej)
Fix spec (again).
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- entrance.spec 20 Dec 2005 19:29:16 - 1.12
+++ entrance.spec 28 Dec 2005 05:27:34 - 1.13
@@ -28,7 +28,7 @@
%install
%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
-%{__rm} -rf ${HOME:/tmp}/.ecore || :
+test -d ${HOME:-/tmp}/.ecore && %{__rm} -rf ${HOME:-/tmp}/.ecore || :
%post
/sbin/ldconfig || :
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Tue Dec 20 14:37:13 2005Michael Jennings (mej)
Minor spec fix.
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- entrance.spec 20 Dec 2005 02:27:59 - 1.11
+++ entrance.spec 20 Dec 2005 19:29:16 - 1.12
@@ -28,7 +28,7 @@
%install
%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
-%{__rm} -rf ${HOME:/}/.ecore
+%{__rm} -rf ${HOME:/tmp}/.ecore || :
%post
/sbin/ldconfig || :
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: entrance.spec Log Message: Mon Dec 19 21:35:51 2005Michael Jennings (mej) Oops, didn't mean to change the spec files. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- entrance.spec 20 Dec 2005 02:19:59 - 1.10 +++ entrance.spec 20 Dec 2005 02:27:59 - 1.11 @@ -1,7 +1,7 @@ Summary: enlightened display manager Name: entrance Version: 0.9.0.004 -Release: 1.20051219 +Release: 0.%(date '+%Y%m%d') License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/ --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: entrance.spec Log Message: Mon Dec 19 21:27:49 2005Michael Jennings (mej) Modules moved. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- entrance.spec 3 Nov 2005 04:49:27 - 1.9 +++ entrance.spec 20 Dec 2005 02:19:59 - 1.10 @@ -1,7 +1,7 @@ Summary: enlightened display manager Name: entrance Version: 0.9.0.004 -Release: 0.%(date '+%Y%m%d') +Release: 1.20051219 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/ --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Wed Nov 2 23:57:23 2005Michael Jennings (mej)
Remove extraneous files thrown in the home dir during build.
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- entrance.spec 8 Sep 2005 21:04:21 - 1.8
+++ entrance.spec 3 Nov 2005 04:49:27 - 1.9
@@ -1,7 +1,7 @@
Summary: enlightened display manager
Name: entrance
Version: 0.9.0.004
-Release: 0.20050908
+Release: 0.%(date '+%Y%m%d')
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org/
@@ -28,6 +28,7 @@
%install
%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
+%{__rm} -rf ${HOME:/}/.ecore
%post
/sbin/ldconfig || :
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/config/pam.d Modified Files: entrance Log Message: Thu Oct 13 12:56:20 2005Michael Jennings (mej) Add pam_console.so as optional PAM module (needed for cAos, et al.). -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/config/pam.d/entrance,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- entrance24 Jun 2004 06:11:29 - 1.3 +++ entrance13 Oct 2005 16:48:23 - 1.4 @@ -5,3 +5,4 @@ accountrequiredpam_unix.so password requiredpam_unix.so sessionrequiredpam_unix.so +sessionoptionalpam_console.so --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Thu Sep 8 17:12:14 2005Michael Jennings (mej)
Build fixes.
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- entrance.spec 30 Aug 2005 19:05:29 - 1.7
+++ entrance.spec 8 Sep 2005 21:04:21 - 1.8
@@ -1,7 +1,7 @@
Summary: enlightened display manager
Name: entrance
Version: 0.9.0.004
-Release: 1
+Release: 0.20050908
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org/
@@ -9,8 +9,8 @@
Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL
PROTECTED]>}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-#BuildSuggests: xorg-x11-xdm
-BuildRequires: libjpeg-devel, zlib-devel, XFree86-xdm
+#BuildSuggests: xorg-x11-xdm, XFree86-xdm
+BuildRequires: libjpeg-devel, zlib-devel, /etc/X11/xdm/Xsession
BuildRequires: ecore-devel, edje-devel, esmart-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/doc Added Files: .cvsignore Log Message: Thu Sep 1 16:53:13 2005Michael Jennings (mej) Build and cvsignore fixes. -- --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: .cvsignore Log Message: Thu Sep 1 16:53:13 2005Michael Jennings (mej) Build and cvsignore fixes. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- .cvsignore 24 Aug 2005 15:47:36 - 1.4 +++ .cvsignore 1 Sep 2005 20:45:21 - 1.5 @@ -14,3 +14,4 @@ install-sh missing ltmain.sh +*.tar.gz --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Tue Aug 30 15:13:28 2005Michael Jennings (mej)
More build fixes, new spec files, etc.
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- entrance.spec 29 Aug 2005 23:27:18 - 1.6
+++ entrance.spec 30 Aug 2005 19:05:29 - 1.7
@@ -9,7 +9,9 @@
Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL
PROTECTED]>}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-BuildRequires: libjpeg-devel zlib-devel
+#BuildSuggests: xorg-x11-xdm
+BuildRequires: libjpeg-devel, zlib-devel, XFree86-xdm
+BuildRequires: ecore-devel, edje-devel, esmart-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Mon Aug 29 19:35:18 2005Michael Jennings (mej)
More spec file fixes.
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entrance.spec 16 Aug 2005 04:04:04 - 1.5
+++ entrance.spec 29 Aug 2005 23:27:18 - 1.6
@@ -1,7 +1,7 @@
Summary: enlightened display manager
Name: entrance
-Version: 0.9.0
-Release: 1.%(date '+%Y%m%d')
+Version: 0.9.0.004
+Release: 1
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org/
@@ -47,10 +47,6 @@
%{_bindir}/entrance_login
%{_bindir}/entrance_wrapper
%{_sbindir}/entranced
-%{_datadir}/entrance/fonts/*.ttf
-%{_datadir}/entrance/images/*.png
-%{_datadir}/entrance/images/sessions/*
-%{_datadir}/entrance/themes/*.eet
-%{_datadir}/entrance/users/*.eet
+%{_datadir}/%{name}
%changelog
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Wed Jan 5 00:03:30 2005Michael Jennings (mej)
Assorted spec file cleanups.
Do not override --bindir and --libdir (breaks x86_64).
Some of these are still untested, so please be patient.
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- entrance.spec 20 Jul 2004 18:32:34 - 1.3
+++ entrance.spec 5 Jan 2005 05:05:25 - 1.4
@@ -2,12 +2,14 @@
Name: entrance
Version: 0.9.0
Release: 1.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
Group: System Environment/Libraries
-Source: ftp://ftp.enlightenment.org/pub/entrance/%{name}-%{version}.tar.gz
-Packager: Michael Jennings <[EMAIL PROTECTED]>
URL: http://www.enlightenment.org/
-#BuildSuggests: libjpeg-devel zlib-devel
+Source: ftp://ftp.enlightenment.org/pub/entrance/%{name}-%{version}.tar.gz
+Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL
PROTECTED]>}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+BuildRequires: libjpeg-devel zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
---
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almosthttp://www.thinkgeek.com/sfshirt
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/users/default Modified Files: Makefile.am build_theme.sh Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/users/default/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 22 Oct 2003 11:30:00 - 1.1 +++ Makefile.am 20 Jul 2004 18:32:44 - 1.2 @@ -10,4 +10,4 @@ all: $(EET) $(EET): $(SCRIPT) - sh $< + sh $< $(top_srcdir)/data/users/default === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/users/default/build_theme.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- build_theme.sh 22 Oct 2003 11:30:00 - 1.1 +++ build_theme.sh 20 Jul 2004 18:32:44 - 1.2 @@ -1,2 +1,8 @@ #!/bin/sh -e -edje_cc -v -id ./images default.edc ./default.eet + +if [ "x$1" != "x" ]; then +SRCDIR=$1 +else +SRCDIR=. +fi +edje_cc -v -id $SRCDIR/img $SRCDIR/default.edc $SRCDIR/default.eet --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/themes/Nebulous Modified Files: Makefile.am build_theme.sh Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/themes/Nebulous/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 16 Oct 2003 03:30:20 - 1.2 +++ Makefile.am 20 Jul 2004 18:32:35 - 1.3 @@ -2,7 +2,7 @@ SCRIPT = build_theme.sh CLEANFILES = $(EET) -EXTRA_DIST = $(SCRIPT) +EXTRA_DIST = $(SCRIPT) Nebulous.edc defaultdir = $(pkgdatadir)/themes default_DATA = $(EET) @@ -10,4 +10,4 @@ all: $(EET) $(EET): $(SCRIPT) - sh $< + sh $< $(top_srcdir)/data/themes/Nebulous === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/themes/Nebulous/build_theme.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- build_theme.sh 16 Oct 2003 03:30:20 - 1.3 +++ build_theme.sh 20 Jul 2004 18:32:35 - 1.4 @@ -1,2 +1,8 @@ #!/bin/sh -e -edje_cc -v -id ./images ./Nebulous.edc ./Nebulous.eet + +if [ "x$1" != "x" ]; then +SRCDIR=$1 +else +SRCDIR=. +fi +edje_cc -v -id $SRCDIR/img $SRCDIR/Nebulous.edc $SRCDIR/Nebulous.eet --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/themes/taillights Modified Files: Makefile.am Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/themes/taillights/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 23 May 2004 14:04:21 - 1.3 +++ Makefile.am 20 Jul 2004 18:32:43 - 1.4 @@ -12,4 +12,4 @@ all: $(DB) $(DB): taillights.edc - $(CC) $(INCLUDES) taillights.edc $@ + (cd $(top_srcdir)/data/themes/taillights ; $(CC) $(INCLUDES) taillights.edc $(top_builddir)/data/themes/taillights/$@) --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/themes/default Modified Files: Makefile.am build_theme.sh Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/themes/default/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 16 Oct 2003 03:30:21 - 1.4 +++ Makefile.am 20 Jul 2004 18:32:38 - 1.5 @@ -2,7 +2,7 @@ SCRIPT = build_theme.sh CLEANFILES = $(EET) -EXTRA_DIST = $(SCRIPT) +EXTRA_DIST = $(SCRIPT) default.edc defaultdir = $(pkgdatadir)/themes default_DATA = $(EET) @@ -10,4 +10,4 @@ all: $(EET) $(EET): $(SCRIPT) - sh $< + sh $< $(top_srcdir)/data/themes/default === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/themes/default/build_theme.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- build_theme.sh 16 Oct 2003 03:30:21 - 1.5 +++ build_theme.sh 20 Jul 2004 18:32:43 - 1.6 @@ -1,2 +1,8 @@ #!/bin/sh -e -edje_cc -v -id ./img ./default.edc ./default.eet + +if [ "x$1" != "x" ]; then +SRCDIR=$1 +else +SRCDIR=. +fi +edje_cc -v -id $SRCDIR/img $SRCDIR/default.edc $SRCDIR/default.eet --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
entrance.spec
Log Message:
Tue Jul 20 14:29:47 2004Michael Jennings (mej)
It took me about 3 years (:-P) but I finally got this thing passing
"make distcheck" and building proper RPM's.
My solution isn't the most elegant, but since "make distcheck" changes
$(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much
in the way of alternatives.
--
===
RCS file: /cvsroot/enlightenment/e17/apps/entrance/entrance.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- entrance.spec 23 May 2004 14:14:24 - 1.2
+++ entrance.spec 20 Jul 2004 18:32:34 - 1.3
@@ -1,37 +1,29 @@
Summary: enlightened display manager
Name: entrance
Version: 0.9.0
-Release: 1
+Release: 1.%(date '+%Y%m%d')
Copyright: BSD
Group: System Environment/Libraries
-Source: ftp://ftp.enlightenment.org/pub/evoak/%{name}-%{version}.tar.gz
-Packager: Azundris <[EMAIL PROTECTED]>
+Source: ftp://ftp.enlightenment.org/pub/entrance/%{name}-%{version}.tar.gz
+Packager: Michael Jennings <[EMAIL PROTECTED]>
URL: http://www.enlightenment.org/
-BuildRequires: libjpeg-devel zlib-devel
-Requires: libjpeg zlib ecore evas eet imlib2
+#BuildSuggests: libjpeg-devel zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
-entrance is beauteous and highly themable X display manager / login daemon thingie.
+Entrance is the Enlightenment Display Manager. And like Enlightenment,
+it takes beauty and customization to levels that KDM and GDM can only
+dream about...and without the bloat.
%prep
%setup -q
%build
-%{configure}
-
-if [ "$SMP" != "" ]; then
- (%{__make} "MAKE=make -k -j $SMP"; exit 0)
- %{__make}
-else
- %{__make}
-fi
+%{configure} --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} %{?mflags}
%install
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
%post
/sbin/ldconfig || :
@@ -39,26 +31,24 @@
%postun
/sbin/ldconfig || :
-%files
-%defattr(-, root, root)
-%doc AUTHORS COPYING README
+%clean
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS COPYING* README
%{_sysconfdir}/entrance_config.db
-%{_sysconfdir}/init.d
%{_sysconfdir}/init.d/entrance
-%{_sysconfdir}/pam.d
%{_sysconfdir}/pam.d/entrance
%{_bindir}/entrance
%{_bindir}/entrance_edit
%{_bindir}/entrance_login
%{_bindir}/entrance_wrapper
-%{_prefix}/sbin/entranced
+%{_sbindir}/entranced
%{_datadir}/entrance/fonts/*.ttf
%{_datadir}/entrance/images/*.png
%{_datadir}/entrance/images/sessions/*
%{_datadir}/entrance/themes/*.eet
%{_datadir}/entrance/users/*.eet
-
%changelog
-* Sun May 23 2004 Azundris <[EMAIL PROTECTED]>
-- Created spec file
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/config/init.d Modified Files: Makefile.am Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/config/init.d/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 21 Oct 2003 23:50:56 - 1.1 +++ Makefile.am 20 Jul 2004 18:32:35 - 1.2 @@ -1,3 +1,3 @@ -initdir = $(sysconfdir)/init.d +initdir = $(prefix)/../$(sysconfdir)/init.d init_SCRIPTS = entrance # Install permissions need to be 744 --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/daemon Modified Files: Makefile.am Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- Makefile.am 23 May 2004 14:04:22 - 1.12 +++ Makefile.am 20 Jul 2004 18:32:44 - 1.13 @@ -4,7 +4,7 @@ sbin_PROGRAMS = entranced bin_SCRIPTS = entrance_wrapper -localstate_DATA = +#localstate_DATA = entranced_SOURCES = \ auth.c auth.h Entranced.h ipc.c ipc.h md5.c md5.h spawner.c util.c util.h @@ -12,4 +12,5 @@ entranced_LDADD = @x_libs@ -lXau @ecore_libs@ @edb_libs@ install-data-hook: - chmod 700 $(DESTDIR)@localstatedir@ + $(mkinstalldirs) $(DESTDIR)$(prefix)/../$(localstatedir) + chmod 700 $(DESTDIR)$(prefix)/../$(localstatedir) --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/config/pam.d Modified Files: Makefile.am Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/config/pam.d/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 23 May 2004 14:04:21 - 1.2 +++ Makefile.am 20 Jul 2004 18:32:35 - 1.3 @@ -1,3 +1,3 @@ EXTRA_DIST = entrance -pamdir = $(sysconfdir)/pam.d +pamdir = $(prefix)/../$(sysconfdir)/pam.d pam_DATA = entrance --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance mej
Enlightenment CVS committal Author : mej Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: Makefile.am Log Message: Tue Jul 20 14:29:47 2004Michael Jennings (mej) It took me about 3 years (:-P) but I finally got this thing passing "make distcheck" and building proper RPM's. My solution isn't the most elegant, but since "make distcheck" changes $(prefix) instead of $(DISTDIR) (which sucks goat), I didn't see much in the way of alternatives. -- === RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/config/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 24 May 2003 00:06:32 - 1.1 +++ Makefile.am 20 Jul 2004 18:32:35 - 1.2 @@ -4,7 +4,7 @@ CLEANFILES = $(DB) EXTRA_DIST = $(SCRIPT) -configdbdir = $(sysconfdir) +configdbdir = $(prefix)/../$(sysconfdir) configdb_DATA = $(DB) all: $(DB) --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
