diff -r 53c66cb9f5bd -r 6cdc2e7b1937 vym.pro
--- a/vym.pro	Mon Oct 22 09:50:03 2007 +0000
+++ b/vym.pro	Mon Oct 22 09:50:08 2007 +0000
@@ -3,6 +3,13 @@
 
 CONFIG	+= qt warn_on release debug
 CONFIG += x86 ppc
+
+# Manifest embedding was suggested by Qt docs somewhere...
+win32: CONFIG += embed_manifest_exe
+
+# Without this, M_PI, and M_PI_2 won't be defined.
+win32:DEFINES *= _USE_MATH_DEFINES
+
 ICON =icons/vym.icns
 
 QT += qt3support
@@ -121,26 +128,43 @@
 TRANSLATIONS += lang/vym_es.ts
 TRANSLATIONS += lang/vym_it.ts
 
-count( INSTALLDIR, 0 ) {
-	INSTALLDIR = /usr/local
+isEmpty( PREFIX ) {
+	PREFIX = /usr/local
+	count( INSTALLDIR, 1 ) {
+		PREFIX = $${INSTALLDIR}
+		message( "Please use PREFIX instead of INSTALLDIR" )
+	}
+}
+isEmpty( BINDIR ) {
+	BINDIR = $${PREFIX}/bin
+}
+isEmpty( DATADIR ) {
+	DATADIR = $${PREFIX}/share
+}
+isEmpty( DOCDIR ) {
+	DOCDIR = $${DATADIR}/doc/packages/vym
+}
+isEmpty( DEMODIR ) {
+	DEMODIR = $${DOCDIR}
 }
 
 message( "Installation directory" )
-message( $$INSTALLDIR )
+message( $$PREFIX )
 
 
-target.path = $${INSTALLDIR}/bin
+target.path = $${BINDIR}
 INSTALLS += target
 
 support.files = styles/ scripts/ icons/ flags/ lang/ macros/ exports/
-support.path = $${INSTALLDIR}/share/vym
+support.path = $${DATADIR}/vym
 INSTALLS += support 
 
-doc.files = tex/vym.pdf 
-doc.path = $${INSTALLDIR}/share/doc/packages/vym
+doc.files = tex/vym.pdf
+doc.path = $${DOCDIR}
 INSTALLS += doc
+DEFINES += VYM_DOCDIR=\\\"$${DOCDIR}\\\"
 
 demo.files = demos/
-demo.path = $${INSTALLDIR}/share/doc/packages/vym
+demo.path = $${DEMODIR}
 INSTALLS += demo