[gcompris/gcomprixogoo] Fixed to exclude .git from installation.



commit 2da3051cfbc085eb110b1fe0e1132eaaa47d0014
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Jan 10 16:14:35 2010 +0100

    Fixed to exclude .git from installation.
    
    Fixed also the update-voices target.

 Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ed41aa1..70f03eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,13 +56,13 @@ install-data-local:
 	@$(NORMAL_INSTALL)
 	if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
 	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR); \
-	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
+	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .git * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
 	fi
 
 dist-hook:
 	if test -d $(PACKAGE_DATA_DIR); then \
 	  $(mkinstalldirs) $(distdir)/$(PACKAGE_DATA_DIR); \
-	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "Makefile" --exclude "*~" --exclude ".*" --exclude .svn * | ( cd ../$(distdir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
+	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "Makefile" --exclude "*~" --exclude ".*" --exclude .git * | ( cd ../$(distdir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
 	fi
 	@if test -d "$(srcdir)/.git"; \
 	then \
@@ -86,10 +86,10 @@ clean-local:
 
 update-voices:
 	@if test -d $(PACKAGE_DATA_DIR)/voices; then \
-	  svn up $(PACKAGE_DATA_DIR)/voices; \
+	  cd $(PACKAGE_DATA_DIR)/voices ; git pull; cd -; \
 	else \
 	  mkdir $(PACKAGE_DATA_DIR)/voices; \
-	  svn co http://svn.gnome.org/svn/gcompris/voices $(PACKAGE_DATA_DIR)/voices; \
+	  cd $(PACKAGE_DATA_DIR) ; git checkout -b voices origin/voices ; cd -; \
 	fi
 
 all-local:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]