Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (07e74ede4ccaa44632aa2951b56c5642f650f273)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (07e74ede4ccaa44632aa2951b56c5642f650f273)
  • Date: Mon, 7 Jul 2014 06:17:36 -0500

GIT changes to master z-rejected grimoire by Remko van der Vossen
<wich AT yuugen.jp>:

z-windowmanagers/notion/BUILD | 2 +-
z-windowmanagers/notion/CONFIGURE | 15 +++++++++++++--
z-windowmanagers/notion/HISTORY | 2 ++
z-windowmanagers/notion/INSTALL | 2 +-
z-windowmanagers/notion/PRE_BUILD | 10 ----------
5 files changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 07e74ede4ccaa44632aa2951b56c5642f650f273
Author: Remko van der Vossen <wich AT yuugen.jp>
Commit: Remko van der Vossen <wich AT yuugen.jp>

notion: fix build/install configuration

diff --git a/z-windowmanagers/notion/BUILD b/z-windowmanagers/notion/BUILD
index 8f58e6d..89079e8 100755
--- a/z-windowmanagers/notion/BUILD
+++ b/z-windowmanagers/notion/BUILD
@@ -1 +1 @@
-make
+make PREFIX=/usr ETCDIR=/etc/notion $NOTION_SYSTEM_ASPRINTF
diff --git a/z-windowmanagers/notion/CONFIGURE
b/z-windowmanagers/notion/CONFIGURE
index b4f830d..d838a38 100755
--- a/z-windowmanagers/notion/CONFIGURE
+++ b/z-windowmanagers/notion/CONFIGURE
@@ -1,7 +1,18 @@
# Standard rejected warnings.
source $GRIMOIRE/REJECTED_MSG &&

+# asprintf flag is now passed to make as an option, so rewrite
+# the persistent variable to the correct make option
+persistent_load &&
+if [[ "$NOTION_SYSTEM_ASPRINTF" == "y" ]]; then
+ NOTION_SYSTEM_ASPRINTF="HAS_SYSTEM_ASPRINTF=1"
+ persistent_add NOTION_SYSTEM_ASPRINTF
+elif [[ "$NOTION_SYSTEM_ASPRINTF" == "n" ]]; then
+ NOTION_SYSTEM_ASPRINTF="HAS_SYSTEM_ASPRINTF=0"
+ persistent_add NOTION_SYSTEM_ASPRINTF
+fi &&
+
config_query_option NOTION_SYSTEM_ASPRINTF \
"Use system asprintf?" y \
- "y" \
- "n"
+ "HAS_SYSTEM_ASPRINTF=1" \
+ "HAS_SYSTEM_ASPRINTF=0"
diff --git a/z-windowmanagers/notion/HISTORY b/z-windowmanagers/notion/HISTORY
index 53a3aa3..199cf0b 100644
--- a/z-windowmanagers/notion/HISTORY
+++ b/z-windowmanagers/notion/HISTORY
@@ -1,5 +1,7 @@
2014-07-06 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 3-2014052800
+ * BUILD, CONFIGURE, INSTALL, PREBUILD: configuration options and
+ mechanism have changed

2012-09-17 Remko van der Vossen <wich AT sourcemage.org>
* Created spell based on ion3 spell
diff --git a/z-windowmanagers/notion/INSTALL b/z-windowmanagers/notion/INSTALL
index 700f822..d518a7b 100755
--- a/z-windowmanagers/notion/INSTALL
+++ b/z-windowmanagers/notion/INSTALL
@@ -1,4 +1,4 @@
-default_install &&
+make PREFIX=/usr ETCDIR=/etc/notion install
install_wmfiles &&
[ ! -e $INSTALL_ROOT/usr/bin/startpwm3plus ] &&
install -m 0755 $SCRIPT_DIRECTORY/startpwm3plus \
diff --git a/z-windowmanagers/notion/PRE_BUILD
b/z-windowmanagers/notion/PRE_BUILD
index a71386e..367239a 100755
--- a/z-windowmanagers/notion/PRE_BUILD
+++ b/z-windowmanagers/notion/PRE_BUILD
@@ -1,15 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit 's,^PREFIX=/usr/local,PREFIX=/usr,' system.mk &&
-sedit 's,^LUA_DIR=/usr/local,LUA_DIR=/usr,' system.mk &&
-sedit 's,^X11_PREFIX=/usr/X11R6,PREFIX=/usr,' system.mk &&
-sedit 's,^ETCDIR=$(PREFIX)/etc/,ETCDIR=/etc/,' system.mk &&
-sedit 's,^PREFIX=/usr/local,PREFIX=/usr,' build/system-inc.mk &&
-sedit 's,/usr/local,/usr,' libextl/libextl-mkexports.in &&
-
-if [[ "$NOTION_SYSTEM_ASPRINTF" == "y" ]]; then
- sedit 's,^#\?HAS_SYSTEM_ASPRINTF=[01],HAS_SYSTEM_ASPRINTF=1,' system.mk
-fi

if ! is_depends_enabled $SPELL libxinerama; then
sedit 's,mod_xinerama,,' modulelist.mk



  • [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (07e74ede4ccaa44632aa2951b56c5642f650f273), Remko van der Vossen, 07/07/2014

Archive powered by MHonArc 2.6.24.

Top of Page