diff options
-rw-r--r-- | doc/documentation/chapters/installation.texi | 54 | ||||
-rw-r--r-- | po/Makefile.in.in | 8 | ||||
-rw-r--r-- | po/POTFILES.in | 7 |
3 files changed, 61 insertions, 8 deletions
diff --git a/doc/documentation/chapters/installation.texi b/doc/documentation/chapters/installation.texi index f2042033e..665f980be 100644 --- a/doc/documentation/chapters/installation.texi +++ b/doc/documentation/chapters/installation.texi | |||
@@ -19,6 +19,7 @@ it in the form of new chapters or insightful comments. | |||
19 | * Build instructions for Debian 7.5:: | 19 | * Build instructions for Debian 7.5:: |
20 | * Installing GNUnet from Git on Ubuntu 14.4:: | 20 | * Installing GNUnet from Git on Ubuntu 14.4:: |
21 | * Build instructions for Debian 8:: | 21 | * Build instructions for Debian 8:: |
22 | * Build instructions for macOS:: | ||
22 | @c * Build instructions for OpenBSD 6.2:: | 23 | @c * Build instructions for OpenBSD 6.2:: |
23 | * Outdated build instructions for previous revisions:: | 24 | * Outdated build instructions for previous revisions:: |
24 | @c * Portable GNUnet:: | 25 | @c * Portable GNUnet:: |
@@ -1472,6 +1473,59 @@ with the default Sqlite database. Sqlite is usually fine for most | |||
1472 | applications, but MySQL can offer better performance and Postgres better | 1473 | applications, but MySQL can offer better performance and Postgres better |
1473 | resillience. | 1474 | resillience. |
1474 | 1475 | ||
1476 | @node Build instructions for macOS | ||
1477 | @section Build instructions for macOS | ||
1478 | @c FIXME: I -> we | ||
1479 | |||
1480 | These are the installation guidelines for macOS. | ||
1481 | They were tested on macOS High Sierra. | ||
1482 | |||
1483 | @menu | ||
1484 | * Installing dependencies:: | ||
1485 | * Compile from Source:: | ||
1486 | @end menu | ||
1487 | |||
1488 | @node Installing dependencies | ||
1489 | @subsection Installing dependencies | ||
1490 | |||
1491 | First, install XCode in the newest version. | ||
1492 | See https://developer.apple.com/xcode/. | ||
1493 | |||
1494 | Install Homebrew (https://brew.sh) and then install the dependencies listed above. | ||
1495 | If a dependency does not exists in brew, you need to compile it from source. | ||
1496 | |||
1497 | @example | ||
1498 | # brew install <dependency> | ||
1499 | @end example | ||
1500 | |||
1501 | @node Compile from Source | ||
1502 | @subsection Compile from Source | ||
1503 | |||
1504 | Before you start building GNUnet, you need to setup your environment. | ||
1505 | This means that you have to make sure the proper tools are used in the build process. | ||
1506 | For example, after installing texinfo you need to make sure the new texinfo is actually used: | ||
1507 | |||
1508 | @example | ||
1509 | # echo 'export PATH="/usr/local/opt/texinfo/bin:$PATH"' >> ~/.bash_profile | ||
1510 | @end example | ||
1511 | |||
1512 | Note: brew tells you the appropriate command when executing | ||
1513 | |||
1514 | @example | ||
1515 | # brew info texinfo | ||
1516 | @end example | ||
1517 | |||
1518 | This may also be necessary for the gettext package. | ||
1519 | |||
1520 | Before you start compiling, you need to make sure gcc is used and not the clang compile of your macOS system. | ||
1521 | On my system, gcc was actually ``gcc-7'' and gcc pointed to the clang compiler. | ||
1522 | |||
1523 | @example | ||
1524 | # export CC=gcc-7 | ||
1525 | @end example | ||
1526 | |||
1527 | After this the standard compile instructions apply. | ||
1528 | |||
1475 | @c @node Build instructions for OpenBSD 6.2 | 1529 | @c @node Build instructions for OpenBSD 6.2 |
1476 | @c @section Build instructions for OpenBSD 6.2 | 1530 | @c @section Build instructions for OpenBSD 6.2 |
1477 | 1531 | ||
diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 4daed5420..83d8838ac 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in | |||
@@ -76,16 +76,10 @@ POTFILES = \ | |||
76 | 76 | ||
77 | CATALOGS = @CATALOGS@ | 77 | CATALOGS = @CATALOGS@ |
78 | 78 | ||
79 | do_perl_subst = $(SED) -e 's,[@]PERL[@],$(PERL),g' | ||
80 | |||
81 | # Makevars gets inserted here. (Don't remove this line!) | 79 | # Makevars gets inserted here. (Don't remove this line!) |
82 | 80 | ||
83 | .SUFFIXES: | 81 | .SUFFIXES: |
84 | .SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update .pl.in .pl | 82 | .SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update |
85 | |||
86 | .pl.in.pl: | ||
87 | $(do_perl_subst) < $< > $@ | ||
88 | chmod +x $@ | ||
89 | 83 | ||
90 | .po.mo: | 84 | .po.mo: |
91 | @echo "$(MSGFMT) -c -o $@ $<"; \ | 85 | @echo "$(MSGFMT) -c -o $@ $<"; \ |
diff --git a/po/POTFILES.in b/po/POTFILES.in index 50cf97613..120e3be78 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -119,7 +119,7 @@ src/dns/gnunet-dns-monitor.c | |||
119 | src/dns/gnunet-dns-redirector.c | 119 | src/dns/gnunet-dns-redirector.c |
120 | src/dns/gnunet-helper-dns.c | 120 | src/dns/gnunet-helper-dns.c |
121 | src/dns/gnunet-service-dns.c | 121 | src/dns/gnunet-service-dns.c |
122 | src/dns/gnunet-zoneimport.c | 122 | src/dns/gnunet-zonewalk.c |
123 | src/dns/plugin_block_dns.c | 123 | src/dns/plugin_block_dns.c |
124 | src/dv/dv_api.c | 124 | src/dv/dv_api.c |
125 | src/dv/gnunet-dv.c | 125 | src/dv/gnunet-dv.c |
@@ -172,6 +172,7 @@ src/gns/gns_api.c | |||
172 | src/gns/gns_tld_api.c | 172 | src/gns/gns_tld_api.c |
173 | src/gns/gnunet-bcd.c | 173 | src/gns/gnunet-bcd.c |
174 | src/gns/gnunet-dns2gns.c | 174 | src/gns/gnunet-dns2gns.c |
175 | src/gns/gnunet-gns-benchmark.c | ||
175 | src/gns/gnunet-gns-helper-service-w32.c | 176 | src/gns/gnunet-gns-helper-service-w32.c |
176 | src/gns/gnunet-gns-import.c | 177 | src/gns/gnunet-gns-import.c |
177 | src/gns/gnunet-gns-proxy.c | 178 | src/gns/gnunet-gns-proxy.c |
@@ -350,6 +351,8 @@ src/social/gnunet-service-social.c | |||
350 | src/social/gnunet-social.c | 351 | src/social/gnunet-social.c |
351 | src/social/social_api.c | 352 | src/social/social_api.c |
352 | src/sq/sq.c | 353 | src/sq/sq.c |
354 | src/sq/sq_exec.c | ||
355 | src/sq/sq_prepare.c | ||
353 | src/sq/sq_query_helper.c | 356 | src/sq/sq_query_helper.c |
354 | src/sq/sq_result_helper.c | 357 | src/sq/sq_result_helper.c |
355 | src/statistics/gnunet-service-statistics.c | 358 | src/statistics/gnunet-service-statistics.c |
@@ -454,6 +457,7 @@ src/util/container_multihashmap32.c | |||
454 | src/util/container_multipeermap.c | 457 | src/util/container_multipeermap.c |
455 | src/util/container_multishortmap.c | 458 | src/util/container_multishortmap.c |
456 | src/util/crypto_abe.c | 459 | src/util/crypto_abe.c |
460 | src/util/crypto_bug.c | ||
457 | src/util/crypto_crc.c | 461 | src/util/crypto_crc.c |
458 | src/util/crypto_ecc.c | 462 | src/util/crypto_ecc.c |
459 | src/util/crypto_ecc_dlog.c | 463 | src/util/crypto_ecc_dlog.c |
@@ -507,6 +511,7 @@ src/vpn/gnunet-helper-vpn.c | |||
507 | src/vpn/gnunet-service-vpn.c | 511 | src/vpn/gnunet-service-vpn.c |
508 | src/vpn/gnunet-vpn.c | 512 | src/vpn/gnunet-vpn.c |
509 | src/vpn/vpn_api.c | 513 | src/vpn/vpn_api.c |
514 | src/zonemaster/gnunet-service-zonemaster-monitor.c | ||
510 | src/zonemaster/gnunet-service-zonemaster.c | 515 | src/zonemaster/gnunet-service-zonemaster.c |
511 | src/fs/fs_api.h | 516 | src/fs/fs_api.h |
512 | src/include/gnunet_common.h | 517 | src/include/gnunet_common.h |