diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in
index 5ee78df..5b40027 100644
--- a/Ada95/samples/Makefile.in
+++ b/Ada95/samples/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2012,2015 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,18 +28,22 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.34 2006/12/17 16:45:02 tom Exp $
+#  $Id: Makefile.in,v 1.49 2015/08/05 23:15:41 tom Exp $
 #
 .SUFFIXES:
 
-SHELL		= /bin/sh
+SHELL		= @SHELL@
+VPATH		= @srcdir@
 THIS		= Makefile
 
-x		= @PROG_EXT@
+x		= @EXEEXT@
 
 srcdir		= @srcdir@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
+bindir		= @bindir@
+datarootdir	= @datarootdir@
+datadir		= @datadir@
 libdir		= @libdir@
 includedir	= @includedir@
 
@@ -73,6 +77,13 @@
 
 RANLIB		= @RANLIB@
 ################################################################################
+BINDIR		= $(DESTDIR)$(bindir)
+DATADIR		= $(DESTDIR)$(datadir)
+LIBDIR		= $(DESTDIR)$(libdir)
+
+MY_DATADIR	= $(DATADIR)/AdaCurses
+
+################################################################################
 ada_srcdir=../src
 
 LD_FLAGS     = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS)
@@ -87,33 +98,11 @@
 ABASE        = $(ALIB)-curses
 
 CARGS        =-cargs $(ADAFLAGS)
-LARGS        =-largs @TEST_ARG2@ $(LD_FLAGS) -lAdaCurses
- 
-PROGS        = tour rain ncurses 
+LARGS        =-largs -L../lib -lAdaCurses @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@
 
-TOUR_OBJS    =	tour.o sample.o sample-curses_demo.o sample-explanation.o 	\
-		sample-form_demo.o sample-function_key_setting.o 		\
-		sample-header_handler.o sample-helpers.o 			\
-		sample-keyboard_handler.o sample-manifest.o sample-menu_demo.o	\
-		sample-menu_demo-aux.o sample-text_io_demo.o			\
-		sample-curses_demo-attributes.o sample-curses_demo-mouse.o	\
-		sample-form_demo-aux.o sample-my_field_type.o
+PROGS        = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x 
 
-RAIN_OBJS    =	rain.o status.o
-
-NCURSES_OBJS = ncurses.o        	ncurses2-getch_test.o \
-	ncurses2-acs_and_scroll.o       ncurses2-m.o \
-	ncurses2-acs_display.o          ncurses2-menu_test.o \
-	ncurses2-attr_test.o            ncurses2-overlap_test.o \
-	ncurses2-color_edit.o           ncurses2-slk_test.o \
-	ncurses2-color_test.o           ncurses2-test_sgr_attributes.o \
-	ncurses2-demo_forms.o           ncurses2-trace_set.o \
-	ncurses2-demo_pad.o             ncurses2-util.o \
-	ncurses2-demo_panels.o          ncurses2.o \
-	ncurses2-flushinp_test.o
-
-
-all ::  tour$x rain$x ncurses$x
+all ::  $(PROGS)
 	@echo made $@
 
 sources :
@@ -128,15 +117,28 @@
 uninstall.libs ::
 	@echo made $@
 
+install.examples :: $(BINDIR) $(PROGS)
+	$(INSTALL) $(PROGS) $(BINDIR)
+
+install.examples :: $(MY_DATADIR)
+	$(INSTALL_DATA) explain.txt $(MY_DATADIR)
+
+uninstall.examples ::
+	-cd $(BINDIR) && rm -f $(PROGS)
+	-rmdir $(BINDIR)
+	-rm -f $(MY_DATADIR)/explain.txt
+	-rmdir $(MY_DATADIR)
+
+$(BINDIR) \
+$(MY_DATADIR) :
+	mkdir -p $@
+
 ncurses$x :
 	$(ADAMAKE) $(ADAMAKEFLAGS) ncurses $(CARGS) $(LARGS)
 
-tour$x :	explain.msg
+tour$x :
 	$(ADAMAKE) $(ADAMAKEFLAGS) tour $(CARGS) $(LARGS)
 
-explain.msg:	$(srcdir)/explain.txt
-	cp $(srcdir)/explain.txt $@
-
 rain$x :
 	$(ADAMAKE) $(ADAMAKEFLAGS) rain $(CARGS) $(LARGS)
 
@@ -145,7 +147,7 @@
 
 clean :: mostlyclean
 	rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] \
-	explain.msg trace screendump 
+	trace screendump b~*.ad[bs]
 
 distclean :: clean
 	rm -f Makefile