Paul Bryan Roberts : libwine: Avoid writing to repository during install.

Alexandre Julliard julliard at winehq.org
Thu Jan 15 08:51:22 CST 2009


Module: wine
Branch: master
Commit: d2b13825e402c970c4eeb1a1ed174deb26267782
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d2b13825e402c970c4eeb1a1ed174deb26267782

Author: Paul Bryan Roberts <pbronline-wine at yahoo.co.uk>
Date:   Wed Jan 14 07:20:30 2009 +0000

libwine: Avoid writing to repository during install.

---

 libs/.gitignore       |    1 -
 libs/wine/Makefile.in |    9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/libs/.gitignore b/libs/.gitignore
index b332749..f793fc9 100644
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -1,4 +1,3 @@
 *.dylib
 *.so.*
-wine/version-stamp
 wine/version.c
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 6bdf55f..c846848 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -176,14 +176,11 @@ uninstall::
 	-cd $(DESTDIR)$(libdir) && $(RM) libwine.a libwine.dll libwine.so libwine.so.$(VERSION) \
 		libwine.so.$(SOVERSION) libwine.dylib libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib
 
-version-stamp: dummy
-	(GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD 2>/dev/null || echo "wine- at PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p' >$@ || ($(RM) $@ && exit 1)
-
-version.c: version-stamp
-	@cmp -s version-stamp $@ || cp version-stamp $@
+version.c: dummy
+	version=`(GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD 2>/dev/null || echo "wine- at PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
 
 clean::
-	$(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c version-stamp
+	$(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c
 
 $(RELPATH):
 	@cd $(TOOLSDIR)/tools && $(MAKE) relpath




More information about the wine-cvs mailing list