X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=INSTALL;h=754a32b93efca0203eb45959f9fcbfe059e5609b;hb=d6351325056a94e2db0c8c533c7d16eb5c278861;hp=4ea90807dd8fe4160e8820a1eb05ecdc76b7ca9c;hpb=2373f904265a05761039cfc5fe305bf588e831c5;p=fontconfig.git

diff --git a/INSTALL b/INSTALL
index 4ea9080..754a32b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,12 @@ Fontconfig is built with the traditional configure script:
 
 	$ ./configure --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man
 
-This should generate valid Makefiles, then:
+If you checked out from the git repository (as opposed to downloading a
+tarball), you need to run autogen.sh instead of configure:
+
+	$ ./autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man
+
+Either way, that should generate valid Makefiles, then:
 
 	$ make
 	$ make install
@@ -10,44 +15,28 @@ This should generate valid Makefiles, then:
 If you're going to package fontconfig for release, there are several
 important steps:
 
- 1.	Update the version numbers
- 		configure.in
-		fontconfig/fontconfig.h
-
- 2.	Fix the README
- 		Change version number
-		Set the date
-		Append the short log
-
-		git-log --pretty=short 2.4.xx.. | git-shortlog
+ 1.	Create new version
+ 		sh new-version.sh 2.xx.xx
 		
- 3.	Commit those changes
- 
- 4. 	rebuild the configuration files with autogen.sh
- 		sh autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man --localstatedir=/var
+ 2. 	rebuild the configuration files with autogen.sh
+		./autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man --localstatedir=/var
 		
- 5.	make distcheck (NB: won't work without docbook-utils -PL)
+ 3.	make distcheck
  
- 6.	tag the tree
- 		git-tag -u 096c4dd3 -m 'Version 2.4.x' 2.4.x
-		
- 7.	make Changelog-2.4.x
- 		git-log --stat 2.4.(x-1).. > ChangeLog-2.4.x
-		
- 8.	Copy ChangeLog-2.4.x and fontconfig-2.4.x.tar.gz to
+ 4.	Copy ChangeLog-2.x.y and fontconfig-2.x.y.tar.gz to
  
- 	freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
+ 		freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
 	
- 9.	Update the Fontconfig Devel wiki page
+ 5.	Update the Fontconfig Devel wiki page
  	http://fontconfig.org/wiki/Devel
 	
-10.	Update the fontconfig documentation
+ 6.	Update the fontconfig documentation
 
 		scp -rp doc/fontconfig-user.html doc/fontconfig-devel fontconfig.org:/srv/fontconfig.freedesktop.org/www
 
-11.	Compute md5sums for release files:
+ 7.	Compute md5sums for release files:
 		md5sum fontconfig-2.4.x.tar.gz ChangeLog-2.4.x
 		
-12.	Post a note to fontconfig@fontconfig.org.  Include the md5sums.
+ 8.	Post a note to fontconfig@fontconfig.org.  Include the md5sums.
 	gpg sign the message.