Skip to content

Commit

Permalink
Fixes for other OS's and compile options. Change where to report erro…
Browse files Browse the repository at this point in the history
…rs and addd my own copyright.
  • Loading branch information
rocky committed Dec 31, 2014
1 parent 4a9514d commit 491daf0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -103,7 +103,7 @@ EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cstms.c
noinst_HEADERS = commands.h dep.h filedef.h job.h makeint.h rule.h variable.h \
debug.h getopt.h gettext.h hash.h output.h implicit.h \
buildargv.h expand.h file.h function.h read.h main.h make.h \
print.h trace.h types.h \
print.h trace.h types.h vpath.h \
$(DEBUGGER_H)

make_LDADD = @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@ \
Expand Down
5 changes: 3 additions & 2 deletions main.c
Expand Up @@ -2939,7 +2939,7 @@ print_usage (int bad)
fprintf (usageto, _("\nThis program built for %s (%s)\n"),
make_host, remote_description);

fprintf (usageto, _("Report bugs to <bug-make@gnu.org>\n"));
fprintf (usageto, _("Report bugs to https://github.com/rocky/remake/issues\n"));
}

/* Decode switches from ARGC and ARGV.
Expand Down Expand Up @@ -3497,7 +3497,8 @@ print_version (void)
year, and none of the rest of it should be translated (including the
word "Copyright"), so it hardly seems worth it. */

printf ("%sCopyright (C) 1988-2014 Free Software Foundation, Inc.\n",
printf ("%sCopyright (C) 1988-2014 Free Software Foundation, Inc.\n"
"Copyright (C) 2015 Rocky Bernstein.\n",
precede);

printf (_("%sLicense GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
Expand Down
12 changes: 0 additions & 12 deletions make.h
Expand Up @@ -381,16 +381,6 @@ void ar_parse_name (const char *, char **, char **);
int ar_touch (const char *);
time_t ar_member_date (const char *);

typedef long int (*ar_member_func_t) (int desc, const char *mem, int truncated,
long int hdrpos, long int datapos,
long int size, long int date, int uid,
int gid, int mode, const void *arg);

long int ar_scan (const char *archive, ar_member_func_t function, const void *arg);
int ar_name_equal (const char *name, const char *mem, int truncated);
#ifndef VMS
int ar_member_touch (const char *arname, const char *memname);
#endif
#endif

int dir_file_exists_p (const char *, const char *);
Expand Down Expand Up @@ -584,6 +574,4 @@ extern int handling_fatal_signal;
NULL at the end of the directory--and _doesn't_ reset errno. So, we have
to do it ourselves here. */

#define ENULLLOOP(_v,_c) do { errno = 0; (_v) = _c; } \
while((_v)==0 && errno==EINTR)
#endif /*MAKE_H*/
6 changes: 6 additions & 0 deletions makeint.h
Expand Up @@ -17,6 +17,10 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
/* We use <config.h> instead of "config.h" so that a compilation
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
(which it would do because makeint.h was found in $srcdir). */

#ifndef REMAKE_MAKEINT_H
#define REMAKE_MAKEINT_H

#include <config.h>
#undef HAVE_CONFIG_H
#define HAVE_CONFIG_H 1
Expand Down Expand Up @@ -712,3 +716,5 @@ extern int handling_fatal_signal;

#define ENULLLOOP(_v,_c) do { errno = 0; (_v) = _c; } \
while((_v)==0 && errno==EINTR)

#endif /* REMAKE_MAKEINT_H */

0 comments on commit 491daf0

Please sign in to comment.