Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f3643858edbcbb5e3bad396fb9094ae7c995c7dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f3643858edbcbb5e3bad396fb9094ae7c995c7dd)
  • Date: Wed, 25 Mar 2009 18:51:43 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/metalog/HISTORY | 4 ++++
utils/metalog/PRE_BUILD | 4 +++-
utils/metalog/config.patch | 25 +++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit f3643858edbcbb5e3bad396fb9094ae7c995c7dd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

metalog: don't trash alive config

diff --git a/utils/metalog/HISTORY b/utils/metalog/HISTORY
index d65c7c9..5f668dd 100644
--- a/utils/metalog/HISTORY
+++ b/utils/metalog/HISTORY
@@ -1,3 +1,7 @@
+2009-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: don't trash current config by applying the patch
+ * config.patch: added
+
2009-03-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1; fixed descs, website; quoting paths
* DEPENDS: added p7zip; cleaned up
diff --git a/utils/metalog/PRE_BUILD b/utils/metalog/PRE_BUILD
index ec8889c..dcad1ee 100755
--- a/utils/metalog/PRE_BUILD
+++ b/utils/metalog/PRE_BUILD
@@ -2,4 +2,6 @@ default_pre_build &&

7z x -so "$SOURCE_CACHE/$SOURCE" 2> /dev/null | tar x -C "$BUILD_DIRECTORY"
&&

-cd "$SOURCE_DIRECTORY"
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/config.patch"
diff --git a/utils/metalog/config.patch b/utils/metalog/config.patch
new file mode 100644
index 0000000..54ed239
--- /dev/null
+++ b/utils/metalog/config.patch
@@ -0,0 +1,25 @@
+--- Makefile.in.orig 2009-03-15 13:57:01.000000000 +0300
++++ Makefile.in 2009-03-26 02:45:56.593257418 +0300
+@@ -732,12 +732,16 @@
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+- @list='$(sysconf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(sysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(sysconfdir)/$$f'"; \
+- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
+- done
++ @if [ ! -f $(DESTDIR)$(sysconfdir)/metalog.conf ]; then \
++ @list='$(sysconf_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(sysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(sysconfdir)/$$f'"; \
++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++ done \
++ else \
++ echo "$(DESTDIR)$(sysconfdir)/metalog.conf already exists,
install will not overwrite"; \
++ fi
+
+ uninstall-sysconfDATA:
+ @$(NORMAL_UNINSTALL)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f3643858edbcbb5e3bad396fb9094ae7c995c7dd), Vlad Glagolev, 03/25/2009

Archive powered by MHonArc 2.6.24.

Top of Page