diff options
Diffstat (limited to 'sci-astronomy/cdsclient/files')
-rw-r--r-- | sci-astronomy/cdsclient/files/cdsclient-makefile.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch new file mode 100644 index 000000000000..6d135a622056 --- /dev/null +++ b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch @@ -0,0 +1,106 @@ +--- cdsclient-3.81/Makefile.in.orig 2016-02-26 17:33:14.217750589 +0000 ++++ cdsclient-3.81/Makefile.in 2016-02-26 17:38:22.463875411 +0000 +@@ -31,17 +31,17 @@ + ################################################################# + #PREFIX = /usr/local + #PREFIX = $(HOME) +-PREFIX = @prefix@ ++PREFIX = $(DESTDIR)@prefix@ + PACKAGE = cdsclient + VERSION = @version@ + DISTRIB = $(PACKAGE)-$(VERSION) + ################################################################# + + INCDIR = $(PREFIX)/include +-LIBDIR = $(PREFIX)/lib ++LIBDIR = $(DESTDIR)/@libdir@ + BINDIR = $(PREFIX)/bin + SHSDIR = $(PREFIX)/bin +-MANDIR = $(PREFIX)/man ++MANDIR = $(PREFIX)/share/man + ########### + # NOTE: The definition below is required only on SOLARIS + # Comment the following line if required +@@ -57,12 +57,13 @@ + COPY = cp -p + RM = rm + AWK = @AWK@ ++MKDIR = mkdir -p + + # C options -------------------------------- + DEBUG = + C_OPT = -O + SYS = +-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I. ++ + + # FILES -------------------------------- + VERFILE = $(PREFIX)/versions +@@ -102,7 +103,7 @@ + # RULES -------------------------------- + .SUFFIXES: .o .c + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) -I. -c $< + + # DEPENDENCIES -------------------------------- + +@@ -121,41 +122,39 @@ + # rm -f $$f; ln finducac2 $$f; done + + aclient: aclient.o $(OBJ) +- $(CC) $@.o $(OBJ) $(LIBSYS) -o $@ +- $(STRIP) $@ ++ $(CC) $(LDFLAGS) $@.o $(OBJ) $(LIBSYS) -o $@ + + wwwget: wwwget.c +- $(CC) wwwget.c $(LIBSYS) -o $@ +- $(STRIP) $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) wwwget.c $(LIBSYS) -o $@ + + doc: sk.tex man.tex aclient.tex + latex man.tex + +-install: $(EXPORT_INSTALL) install_shs install_info ++install: $(EXPORT_INSTALL) install_shs + rm -rf *.cache + + export_install: install_bin install_man + + install_man: $(MAN) + if [ -d $(MANDIR) ]; then echo $(MANDIR) exists; \ +- else mkdir $(MANDIR); fi ++ else $(MKDIR) $(MANDIR); fi + for f in $(MAN); do \ + e=`echo $$f | cut -d. -f2`; \ + if [ -d $(MANDIR)/man$$e ] ; then echo $(MANDIR)/man$$e exists ; \ +- else mkdir $(MANDIR)/man$$e ; fi ; \ ++ else $(MKDIR) $(MANDIR)/man$$e ; fi ; \ + $(COPY) $$f $(MANDIR)/man$$e ; \ + done + + install_h: $(INC) +- test -d $(INCDIR) || mkdir $(INCDIR) ++ test -d $(INCDIR) || $(MKDIR) $(INCDIR) + $(COPY) $(INC) $(INCDIR) + + install_bin: $(BIN) +- test -d $(BINDIR) || mkdir $(BINDIR) ++ test -d $(BINDIR) || $(MKDIR) $(BINDIR) + $(COPY) $(BIN) $(BINDIR) + + install_shs: Makefile +- test -d $(SHSDIR) || mkdir $(SHSDIR) ++ test -d $(SHSDIR) || $(MKDIR) $(SHSDIR) + ractools=""; test -r $(RACatCDS) && ractools=$(RACatCDS)/*; \ + test -z "$$ractools" || ls -l $$ractools; \ + cdsutil="$(SHSatCDS)"; test -z "$(atCDS)" && cdsutil=""; \ +@@ -195,7 +194,7 @@ + $(MAKE) clean + -test -d /tmp/$(DISTRIB) && rm -rf /tmp/$(DISTRIB) + autoconf +- mkdir /tmp/$(DISTRIB) ++ $(MKDIR) /tmp/$(DISTRIB) + cp -p COPYRIGHT /ftp/pub/sw/COPYING /tmp/$(DISTRIB) + for f in $(SHS) Makefile.in configure; do cp -p $$f /tmp/$(DISTRIB); \ + add_license $$f > /tmp/$(DISTRIB)/$$f; done |