Update man pages and allow dhcpcd-qt to actually be installed now.
authorRoy Marples <roy@marples.name>
Tue, 16 Sep 2014 14:45:00 +0000 (14:45 +0000)
committerRoy Marples <roy@marples.name>
Tue, 16 Sep 2014 14:45:00 +0000 (14:45 +0000)
configure
src/dhcpcd-gtk/dhcpcd-gtk.8
src/dhcpcd-qt/dhcpcd-qt.pro

index 867263c5b618357c05f10e9ad7f8740f86463067..6932778edf9bab05a3040169563b4a2a2e47ba21 100755 (executable)
--- a/configure
+++ b/configure
@@ -382,6 +382,7 @@ echo
 echo "MKDIR=           \${TOPDIR}/mk" >>$CONFIG_MK
 
 if $DHCPCD_QT; then
 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
        if ! (cd src/dhcpcd-qt; qmake $QMAKE_CONFIG dhcpcd-qt.pro); then
                echo "$0: failed to configure dhcpcd-qt" >&2
                exit 1
index 7f1e27109e5c81a3daf4e383041d99a622a75881..15a6463b2de4a2316b2ee9d7829723ea4c01c67c 100644 (file)
@@ -22,8 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" 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
 .Os
 .Sh NAME
 .Nm dhcpcd-gtk
 is a GTK+ frontend for network configuration.
 It uses
 .Xr dhcpcd 8
 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
 .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.
 .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
 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 ,
 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
 .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
index b6702d55aa7f0b8c2e92c980cceb5a0054589273..2f57d2f4090d0f181849578ffa5e82c1bbf4dbfd 100644 (file)
@@ -19,3 +19,16 @@ has_libintl {
 }
 
 QMAKE_CLEAN+=          ${TARGET}
 }
 
 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