From 0637671959b56bba93f39208c825c0d97e2f90df Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann@redhat.com>
Date: Thu, 27 Mar 2008 08:37:29 -0400
Subject: [PATCH] Make username configurable; add Makefile.win32 to EXTRA_DIST

---
 Makefile.am        | 9 +++++++--
 pixman/Makefile.am | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e6b1a60..9a2b991 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,11 +10,12 @@ snapshot:
 	test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git-rev-parse HEAD | cut -c 1-6`; \
 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" dist
 
+USERNAME=$$USER
 RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
-RELEASE_CAIRO_HOST =	cairographics.org
+RELEASE_CAIRO_HOST =	$(USERNAME)@cairographics.org
 RELEASE_CAIRO_DIR =	/srv/cairo.freedesktop.org/www/releases
 RELEASE_CAIRO_URL = 	http://cairographics.org/releases
-RELEASE_XORG_HOST =	xorg.freedesktop.org
+RELEASE_XORG_HOST =	$(USERNAME)@xorg.freedesktop.org
 RELEASE_XORG_DIR =	/srv/xorg.freedesktop.org/archive/individual/lib
 RELEASE_ANNOUNCE_LIST = cairo-announce@cairographics.org
 
@@ -32,6 +33,10 @@ $(gpg_file): $(sha1_file)
 
 release-verify-newer:
 	@echo -n "Checking that no $(VERSION) release already exists..."
+	@ssh $(RELEASE_XORG_HOST) test ! -e $(RELEASE_XORG_DIR)/$(tar_gz) \
+		|| (echo "Ouch." && echo "Found: $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)/$(tar_gz)" \
+		&& echo "Refusing to try to generate a new release of the same name." \
+		&& false)
 	@ssh $(RELEASE_CAIRO_HOST) test ! -e $(RELEASE_CAIRO_DIR)/$(tar_gz) \
 		|| (echo "Ouch." && echo "Found: $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)/$(tar_gz)" \
 		&& echo "Refusing to try to generate a new release of the same name." \
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 251fef9..190df4c 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -27,6 +27,8 @@ libpixmanincludedir = $(includedir)/pixman-1/
 libpixmaninclude_HEADERS = pixman.h pixman-version.h
 noinst_LTLIBRARIES = 
 
+EXTRA_DIST = Makefile.win32
+
 # mmx code
 if USE_MMX
 noinst_LTLIBRARIES += libpixman-mmx.la
-- 
2.7.4