From cf0f9e23732405455f2e0d610d73e8e5f0c36c6d Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 16 Sep 2014 14:45:00 +0000 Subject: [PATCH] Update man pages and allow dhcpcd-qt to actually be installed now. --- configure | 1 + src/dhcpcd-gtk/dhcpcd-gtk.8 | 26 ++++++++++++++++---------- src/dhcpcd-qt/dhcpcd-qt.pro | 13 +++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 867263c..6932778 100755 --- a/configure +++ b/configure @@ -382,6 +382,7 @@ echo echo "MKDIR= \${TOPDIR}/mk" >>$CONFIG_MK if $DHCPCD_QT; then + QMAKE_CONFIG="$QMAKE_CONFIG PREFIX=$PREFIX MANDIR=$MANDIR" if ! (cd src/dhcpcd-qt; qmake $QMAKE_CONFIG dhcpcd-qt.pro); then echo "$0: failed to configure dhcpcd-qt" >&2 exit 1 diff --git a/src/dhcpcd-gtk/dhcpcd-gtk.8 b/src/dhcpcd-gtk/dhcpcd-gtk.8 index 7f1e271..15a6463 100644 --- a/src/dhcpcd-gtk/dhcpcd-gtk.8 +++ b/src/dhcpcd-gtk/dhcpcd-gtk.8 @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 9, 2010 -.Dt DHCPCD-GTK 8 SMM +.Dd September 16, 2014 +.Dt DHCPCD-GTK 8 .Os .Sh NAME .Nm dhcpcd-gtk @@ -33,20 +33,25 @@ is a GTK+ frontend for network configuration. It uses .Xr dhcpcd 8 -as the backend and communicates to it and optionally +and .Xr wpa_supplicant 8 -via -.Nm dhcpcd_dbus . +as backends. +.Pp +If +.Nm +is used to make configuration changes then the user needs to be able +to write to the privileged +.Nm dhcpcd +control socket. +See +.Xr dhcpcd.conf 5 +for details. .Ss wpa_supplicant .Nm relies on .Xr wpa_supplicant 8 being configured to write its sockets to .Pa /var/run/wpa_supplicant. -.Nm -relies on -.Xr wpa_supplicant 8 -being started by the operating system. If .Nm is used to select and set pass phrases for wireless networks then @@ -54,9 +59,10 @@ update_config=1 needs to be set in wpa_supplicant.conf. .Sh SEE ALSO .Xr dhcpcd 8 , +.Xr dhcpcd.conf 5 , .Xr wpa_supplicant 8 , .Xr wpa_supplicant.conf 5 .Sh AUTHORS .An Roy Marples Aq roy@marples.name .Sh BUGS -Please report them to http://roy.marples.name/projects/dhcpcd +Please report them to http://roy.marples.name/projects/dhcpcd-ui diff --git a/src/dhcpcd-qt/dhcpcd-qt.pro b/src/dhcpcd-qt/dhcpcd-qt.pro index b6702d5..2f57d2f 100644 --- a/src/dhcpcd-qt/dhcpcd-qt.pro +++ b/src/dhcpcd-qt/dhcpcd-qt.pro @@ -19,3 +19,16 @@ has_libintl { } QMAKE_CLEAN+= ${TARGET} + +isEmpty(PREFIX) { + PREFIX= /usr/local +} +isEmpty(MANDIR) { + MANDIR= $$PREFIX/share/man +} + +target.path= $$PREFIX/bin +man8.path= $$MANDIR/man8 +man8.files= dhcpcd-qt.8 + +INSTALLS+= target man8 -- 1.7.1