Commit 85a5abb6 authored by CeRiAl's avatar CeRiAl

Global: Fixes for Ubuntu Vivid and friends

parent b5a0a0d2
...@@ -14,11 +14,12 @@ $ ./autogen.sh ...@@ -14,11 +14,12 @@ $ ./autogen.sh
The Debian and Ubuntu GNOME packages don't have reasonable defaults, The Debian and Ubuntu GNOME packages don't have reasonable defaults,
so you have to give ./configure every path manually: so you have to give ./configure every path manually:
$ PPP_VERSION=`pppd --version 2>&1| grep version | awk '{print $3}'`
$ ./configure \ $ ./configure \
--prefix=/usr --localstatedir=/etc --sysconfdir=/etc \ --prefix=/usr --localstatedir=/etc --sysconfdir=/etc \
--sharedstatedir=/var/lib --libexecdir=/usr/lib/NetworkManager \ --sharedstatedir=/var/lib --libexecdir=/usr/lib/NetworkManager \
--infodir=/usr/share/info --mandir=/usr/share/man \ --infodir=/usr/share/info --mandir=/usr/share/man \
--with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 --with-pppd-plugin-dir=/usr/lib/pppd/$PPP_VERSION
$ make $ make
$ sudo make install $ sudo make install
......
...@@ -7,6 +7,7 @@ nm_ipsec_l2tp_auth_dialog_CPPFLAGS = \ ...@@ -7,6 +7,7 @@ nm_ipsec_l2tp_auth_dialog_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(GNOMEKEYRING_CFLAGS) \ $(GNOMEKEYRING_CFLAGS) \
-Wno-error=deprecated-declarations \
-DICONDIR=\""$(datadir)/pixmaps"\" \ -DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \ -DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment