1.1 --- a/vym.pro	Mon Jul 30 09:47:13 2007 +0000
     1.2 +++ b/vym.pro	Tue Oct 23 13:05:22 2007 +0000
     1.3 @@ -3,6 +3,13 @@
     1.4  
     1.5  CONFIG	+= qt warn_on release debug
     1.6  CONFIG += x86 ppc
     1.7 +
     1.8 +# Manifest embedding was suggested by Qt docs somewhere...
     1.9 +win32: CONFIG += embed_manifest_exe
    1.10 +
    1.11 +# Without this, M_PI, and M_PI_2 won't be defined.
    1.12 +win32:DEFINES *= _USE_MATH_DEFINES
    1.13 +
    1.14  ICON =icons/vym.icns
    1.15  
    1.16  QT += qt3support
    1.17 @@ -121,26 +128,43 @@
    1.18  TRANSLATIONS += lang/vym_es.ts
    1.19  TRANSLATIONS += lang/vym_it.ts
    1.20  
    1.21 -count( INSTALLDIR, 0 ) {
    1.22 -	INSTALLDIR = /usr/local
    1.23 +isEmpty( PREFIX ) {
    1.24 +	PREFIX = /usr/local
    1.25 +	count( INSTALLDIR, 1 ) {
    1.26 +		PREFIX = $${INSTALLDIR}
    1.27 +		message( "Please use PREFIX instead of INSTALLDIR" )
    1.28 +	}
    1.29 +}
    1.30 +isEmpty( BINDIR ) {
    1.31 +	BINDIR = $${PREFIX}/bin
    1.32 +}
    1.33 +isEmpty( DATADIR ) {
    1.34 +	DATADIR = $${PREFIX}/share
    1.35 +}
    1.36 +isEmpty( DOCDIR ) {
    1.37 +	DOCDIR = $${DATADIR}/doc/packages/vym
    1.38 +}
    1.39 +isEmpty( DEMODIR ) {
    1.40 +	DEMODIR = $${DOCDIR}
    1.41  }
    1.42  
    1.43  message( "Installation directory" )
    1.44 -message( $$INSTALLDIR )
    1.45 +message( $$PREFIX )
    1.46  
    1.47  
    1.48 -target.path = $${INSTALLDIR}/bin
    1.49 +target.path = $${BINDIR}
    1.50  INSTALLS += target
    1.51  
    1.52  support.files = styles/ scripts/ icons/ flags/ lang/ macros/ exports/
    1.53 -support.path = $${INSTALLDIR}/share/vym
    1.54 +support.path = $${DATADIR}/vym
    1.55  INSTALLS += support 
    1.56  
    1.57 -doc.files = tex/vym.pdf 
    1.58 -doc.path = $${INSTALLDIR}/share/doc/packages/vym
    1.59 +doc.files = tex/vym.pdf
    1.60 +doc.path = $${DOCDIR}
    1.61  INSTALLS += doc
    1.62 +DEFINES += VYM_DOCDIR=\\\"$${DOCDIR}\\\"
    1.63  
    1.64  demo.files = demos/
    1.65 -demo.path = $${INSTALLDIR}/share/doc/packages/vym
    1.66 +demo.path = $${DEMODIR}
    1.67  INSTALLS += demo
    1.68