diff options
| author | lofi <lofi@FreeBSD.org> | 2007-04-20 01:08:04 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2007-04-20 01:08:04 +0800 |
| commit | 43404bb558fdbf21dfea86b33ff69de82991385e (patch) | |
| tree | 7a31726ac01ff730b15d92e60de131efbdf5a4c4 /Mk | |
| parent | 18159a3ac1812e45272d9372ab81e073abaedba1 (diff) | |
| download | freebsd-ports-gnome-43404bb558fdbf21dfea86b33ff69de82991385e.tar.gz freebsd-ports-gnome-43404bb558fdbf21dfea86b33ff69de82991385e.tar.zst freebsd-ports-gnome-43404bb558fdbf21dfea86b33ff69de82991385e.zip | |
Rename all binaries in qt4 which conflict with binaries installed by
qt33 to ($binary)-qt4 and adjust dependencies accordingly. This
avoids conflicts once X11BASE has been changed to /usr/local and
incidentally makes the naming scheme of the qt4 executables in ports
equal to that of the Fedora Core and Debian packages.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.kde.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.kde4.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 080b1919f868..5ee5ee159d8d 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -140,8 +140,8 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL # Qt 4.x common stuff QT_PREFIX?= ${LOCALBASE} -MOC?= ${QT_PREFIX}/bin/moc4 -UIC?= ${QT_PREFIX}/bin/uic4 +MOC?= ${QT_PREFIX}/bin/moc-qt4 +UIC?= ${QT_PREFIX}/bin/uic-qt4 QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++ diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 080b1919f868..5ee5ee159d8d 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -140,8 +140,8 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL # Qt 4.x common stuff QT_PREFIX?= ${LOCALBASE} -MOC?= ${QT_PREFIX}/bin/moc4 -UIC?= ${QT_PREFIX}/bin/uic4 +MOC?= ${QT_PREFIX}/bin/moc-qt4 +UIC?= ${QT_PREFIX}/bin/uic-qt4 QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++ |