*** Makefile.orig	Sun Jul 26 02:05:46 1998
--- Makefile	Fri Dec 18 14:58:50 1998
***************
*** 22,31 ****
  #
  
  # Where to install things for Linux sites (FSSTND)
! BINDIR	= /usr/bin
! LIBDIR	= /etc
! DOCDIR	= /usr/doc/minicom
! MANDIR	= /usr/man/man1
  
  # fmg 8/22/97: seems a more logical place for this :-)
  # Select Compile Options you want:
--- 22,31 ----
  #
  
  # Where to install things for Linux sites (FSSTND)
! # BINDIR	= /usr/bin
! # LIBDIR	= /etc
! # DOCDIR	= /usr/doc/minicom
! # MANDIR	= /usr/man/man1
  
  # fmg 8/22/97: seems a more logical place for this :-)
  # Select Compile Options you want:
***************
*** 40,57 ****
  # -D_I18N_		- Internationalization and localized text strings
  #			  see file "../doc/Locales"
  #
! OPFLAGS	= -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY -D_I18N_
  
  # Remove if you don't have gettext and don't want to install it and use
  # the localized strings
  PO	= po
  
  # Where to install things for FreeBSD sites.
! # BINDIR = /usr/local/bin
! # LIBDIR = /usr/local/etc/minicom
  ##DOCDIR = /usr/local/share/minicom
! # DOCDIR = /usr/local/etc/minicom
! # MANDIR = /usr/local/man/man1
  
  # Where to install things for "normal" sites.
  # BINDIR	= /usr/local/bin
--- 40,63 ----
  # -D_I18N_		- Internationalization and localized text strings
  #			  see file "../doc/Locales"
  #
! OPFLAGS	= -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY ## -D_I18N_
  
  # Remove if you don't have gettext and don't want to install it and use
  # the localized strings
  PO	= po
  
  # Where to install things for FreeBSD sites.
! # BINDIR = $(PREFIX)/bin
! # LIBDIR = $(PREFIX)/etc/minicom
  ##DOCDIR = /usr/local/share/minicom
! # DOCDIR = $(PREFIX)/etc/minicom
! # MANDIR = $(PREFIX)/man/man1
! 
! # Where to install things for OpenBSD sites.
! BINDIR = $(PREFIX)/bin
! LIBDIR = /etc/minicom
! DOCDIR = $(PREFIX)/share/minicom
! MANDIR = $(PREFIX)/man/man1
  
  # Where to install things for "normal" sites.
  # BINDIR	= /usr/local/bin
***************
*** 60,78 ****
  # MANDIR	= /usr/local/man/man1
  
  # Take these compilation flags for Linux with libncurses.
! FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
  PROGS	= minicom runscript ascii-xfr
  LFLAGS	= -s
! LIBS	= -lncurses #-lintl
  CC	= cc
  
- # Take these compilation flags for FreeBSD.
- #FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
- #PROGS	= minicom runscript ascii-xfr
- #LFLAGS	= -s
- #LIBS	= -ltermcap
- #CC	= cc
- 
  # Take these flags for SCO unix.
  #FLAGS	= -D_SYSV -D_SCO -D_POSIX -D_SELECT
  #PROGS	= minicom runscript ascii-xfr
--- 66,91 ----
  # MANDIR	= /usr/local/man/man1
  
  # Take these compilation flags for Linux with libncurses.
! # FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
! # PROGS	= minicom runscript ascii-xfr
! # LFLAGS	= -s
! # LIBS	= -lncurses #-lintl
! # CC	= cc
! 
! # Take these compilation flags for FreeBSD.
! # FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -D_HAVE_MACROS
! # PROGS	= minicom runscript ascii-xfr
! # LFLAGS	= -s
! # LIBS	= -ltermcap -lcurses
! # CC	= cc
! 
! # Take these compilation flags for OpenBSD.
! FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -D_HAVE_MACROS
  PROGS	= minicom runscript ascii-xfr
  LFLAGS	= -s
! LIBS	= -lcurses
  CC	= cc
  
  # Take these flags for SCO unix.
  #FLAGS	= -D_SYSV -D_SCO -D_POSIX -D_SELECT
  #PROGS	= minicom runscript ascii-xfr
***************
*** 188,194 ****
  		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
  
  po: dummy
! 		make -C po
  
  keyserv:	$(KOBJS)
  		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
--- 201,207 ----
  		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
  
  po: dummy
! 		## cd po ; $(MAKE)
  
  keyserv:	$(KOBJS)
  		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
***************
*** 241,252 ****
  dummy:
  
  install:	$(PROGS)
! 		make -C po install R=$(R)
  		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
  
  clobber:
  		rm -f *.o *~ minicom keyserv runscript ascii-xfr
! 		make -C po clean
  
  clean:		
  		rm -f *.o
--- 254,265 ----
  dummy:
  
  install:	$(PROGS)
! 		## cd po ; $(MAKE) install R=$(R)
  		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
  
  clobber:
  		rm -f *.o *~ minicom keyserv runscript ascii-xfr
! 		## cd po ; $(MAKE) clean
  
  clean:		
  		rm -f *.o
