diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-25 01:01:58 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-25 01:01:58 +0000 |
| commit | 285a43902189acd088ba063305d8c6a193833309 (patch) | |
| tree | bb83d94fd66ed21b26fd96b5e10d29d7cac2ddf8 | |
| parent | 05a7ab12c12e8c5209337dcb5c138e3d533c10ce (diff) | |
| download | wireshark-285a43902189acd088ba063305d8c6a193833309.tar.gz wireshark-285a43902189acd088ba063305d8c6a193833309.tar.bz2 wireshark-285a43902189acd088ba063305d8c6a193833309.zip | |
Reinstate r47243 (i.e., revert r50869): with the old way "make distcheck"
fails.
Fix radius/Custom.make so that automake likes it (remove the \ followed by
nothing). Once that's done, make the inclusion of that file mandatory so
that it actually (as I supposed--incorrectly--would happen in r47243) gets
distributed in the source tarball.
svn path=/trunk/; revision=50883
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | radius/Custom.make | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index d18ce207b6..0a1707f663 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,11 +122,10 @@ dist_dtds_DATA = \ # of that directory. # radiusdir = $(pkgdatadir)/radius --include radius/Custom.make +include radius/Custom.make dist_radius_DATA = $(_CUSTOM_radius_dict_) \ radius/README.radius_dictionary \ radius/custom.includes \ - radius/Custom.make \ radius/dictionary \ radius/dictionary.3com \ radius/dictionary.3gpp \ diff --git a/radius/Custom.make b/radius/Custom.make index d38ea7ec9f..b9a0ade851 100644 --- a/radius/Custom.make +++ b/radius/Custom.make @@ -2,4 +2,4 @@ # $Id$ # -_CUSTOM_radius_dict_ = \ +_CUSTOM_radius_dict_ = |