Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (b13567e72bef26e768968ddd31d7bc64d63962db)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ethan Grammatikidis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (b13567e72bef26e768968ddd31d7bc64d63962db)
  • Date: Sun, 16 Mar 2008 15:54:13 -0500

GIT changes to master grimoire by Ethan Grammatikidis <eekee57 AT fastmail.fm>:

windowmanagers/windowlab/HISTORY | 4 ++++
windowmanagers/windowlab/PRE_BUILD | 7 +------
windowmanagers/windowlab/makefile.patch | 25 +++++++++++++++++++++++++
3 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit b13567e72bef26e768968ddd31d7bc64d63962db
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

windowlab: Use patch instead of sedit to correct install paths.
(The sedit silently failed.)

diff --git a/windowmanagers/windowlab/HISTORY
b/windowmanagers/windowlab/HISTORY
index b996488..aaf1f40 100644
--- a/windowmanagers/windowlab/HISTORY
+++ b/windowmanagers/windowlab/HISTORY
@@ -1,3 +1,7 @@
+2008-03-16 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * PRE_BUILD, makefile.patch: Use patch instead of sedit to correct
+ install paths. (The sedit silently failed.)
+
2006-11-23 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS: updated to 1.34

diff --git a/windowmanagers/windowlab/PRE_BUILD
b/windowmanagers/windowlab/PRE_BUILD
index eb3caa4..dcb5918 100755
--- a/windowmanagers/windowlab/PRE_BUILD
+++ b/windowmanagers/windowlab/PRE_BUILD
@@ -1,11 +1,6 @@
default_pre_build &&

-#
-# set correct install destinations
-#
-sedit "s/MANDIR\ =\ \$(DESTDIR)\$(XROOT)\/man\/man1/MANDIR\ =\
${INSTALL_ROOT}\/usr\/share\/man\/man1/g" ${SOURCE_DIRECTORY}/Makefile &&
-sedit "s/BINDIR\ =\ \$(DESTDIR)\$(XROOT)\/bin/BINDIR\ =\
${INSTALL_ROOT}\/usr\/bin/g" ${SOURCE_DIRECTORY}/Makefile
&&
-sedit "s/CFGDIR\ =\ \$(DESTDIR)/CFGDIR\ =\ ${INSTALL_ROOT}/g"
${SOURCE_DIRECTORY}/Makefile &&
+( cd $SOURCE_DIRECTORY && patch -p0 < $SCRIPT_DIRECTORY/makefile.patch ) &&

sedit 's/lucidasans-10/fixed/g' ${SOURCE_DIRECTORY}/windowlab.h &&

diff --git a/windowmanagers/windowlab/makefile.patch
b/windowmanagers/windowlab/makefile.patch
new file mode 100644
index 0000000..79218e6
--- /dev/null
+++ b/windowmanagers/windowlab/makefile.patch
@@ -0,0 +1,25 @@
+--- Makefile.orig 2008-03-16 20:31:25.000000000 +0000
++++ Makefile 2008-03-16 20:36:46.000000000 +0000
+@@ -9,9 +9,10 @@
+
+ # Set this to the location of the X installation you want to compile against
+ XROOT = /usr/X11R6
++INSTALL_ROOT = /usr
+
+ # Set this to the location of the global configuration files
+-SYSCONFDIR = $(PREFIX)/etc/X11/windowlab
++SYSCONFDIR = $(PREFIX)/etc/windowlab
+
+ # Information about the location of the menurc file
+ ifndef MENURC
+@@ -39,8 +40,8 @@
+ CFLAGS = -g -O2 -Wall -W
+ endif
+
+-BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
+-MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/man/man1
++BINDIR = $(DESTDIR)$(PREFIX)$(INSTALL_ROOT)/bin
++MANDIR = $(DESTDIR)$(PREFIX)$(INSTALL_ROOT)/man/man1
+ CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+ INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
+ LDPATH = -L$(XROOT)/lib



  • [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (b13567e72bef26e768968ddd31d7bc64d63962db), Ethan Grammatikidis, 03/16/2008

Archive powered by MHonArc 2.6.24.

Top of Page