1.1 --- a/vym.pro	Thu Jul 27 14:07:11 2006 +0000
     1.2 +++ b/vym.pro	Tue Aug 01 09:31:22 2006 +0000
     1.3 @@ -2,7 +2,6 @@
     1.4  LANGUAGE	= C++
     1.5  
     1.6  CONFIG	+= qt warn_on release
     1.7 -QT += qt3support
     1.8  
     1.9  HEADERS	+= aboutdialog.h \
    1.10  	api.h \
    1.11 @@ -70,8 +69,7 @@
    1.12  	settings.cpp \
    1.13  	options.cpp
    1.14  
    1.15 -#The following line was changed from FORMS to FORMS3 by qt3to4
    1.16 -FORMS3	= exportxhtmldialog.ui \
    1.17 +FORMS	= exportxhtmldialog.ui \
    1.18  	showtextdialog.ui \
    1.19  	extrainfodialog.ui \
    1.20  	editxlinkdialog.ui \
    1.21 @@ -83,27 +81,35 @@
    1.22  TRANSLATIONS += lang/vym_es.ts
    1.23  TRANSLATIONS += lang/vym_it.ts
    1.24  
    1.25 +count( INSTALLDIR, 0 ) {
    1.26 +	INSTALLDIR = /usr/local/bin
    1.27 +}
    1.28  
    1.29 +message( "Installation directory" )
    1.30 +message( $$INSTALLDIR )
    1.31  
    1.32 -DESTROOT = /usr
    1.33  
    1.34 -target.path = $${DESTROOT}/bin
    1.35 +target.path = $$INSTALLDIR
    1.36  INSTALLS += target
    1.37  
    1.38 -support.files = exports/ styles/ scripts/ icons/ flags/ lang/
    1.39 -support.path = $${DESTROOT}/share/vym
    1.40 +
    1.41 +target.path = $${INSTALLDIR}/bin
    1.42 +INSTALLS += target
    1.43 +
    1.44 +support.files = styles/ scripts/ icons/ flags/ lang/
    1.45 +support.path = $${INSTALLDIR}/share/vym
    1.46  INSTALLS += support 
    1.47  
    1.48  doc.files = tex/vym.pdf 
    1.49 -doc.path = $${DESTROOT}/share/doc/packages/vym
    1.50 +doc.path = $${INSTALLDIR}/share/doc/packages/vym
    1.51  INSTALLS += doc
    1.52  
    1.53  demo.files = demos/
    1.54 -demo.path = $${DESTROOT}/share/doc/packages/vym
    1.55 +demo.path = $${INSTALLDIR}/share/doc/packages/vym
    1.56  INSTALLS += demo
    1.57  
    1.58 -#The following line was inserted by qt3to4
    1.59 -QT += xml  
    1.60 -#The following line was inserted by qt3to4
    1.61 -CONFIG += uic3
    1.62 +exports.files = exports/
    1.63 +exports.path =$${INSTALLDIR}/share/vym
    1.64 +INSTALLS += exports
    1.65  
    1.66 +