--- rpl/Makefile.am	2012/01/18 10:57:40	1.43
+++ rpl/Makefile.am	2012/04/08 18:03:09	1.44
@@ -248,46 +248,48 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)
 
-debian: install
+debian: all
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/bin
-	for i in rpl$(EXEEXT) rplcc rplfile$(EXEEXT) rpllink rpltags$(EXEEXT) \
-			mkrplso rplawk$(EXEEXT) rplconvert$(EXEEXT) rpliconv$(EXEEXT) \
-		 	rplpp$(EXEEXT); \
-	do cp -f $(prefix)/bin/$$i $(top_builddir)/debian/$(prefix)/bin; \
+	for i in $(top_builddir)/src/rpl$(EXEEXT) $(top_builddir)/scripts/rplcc \
+			$(top_builddir)/scripts/rpllink $(top_builddir)/scripts/mkrplso \
+			$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			$(top_builddir)/rpltags/rpltags$(EXEEXT) \
+			$(top_builddir)/rplawk/rplawk$(EXEEXT) \
+			$(top_builddir)/rpliconv/rpliconv$(EXEEXT); \
+	do cp -f $$i $(top_builddir)/debian/$(prefix)/bin; \
 	done
+	cp $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \
+			$(top_builddir)/debian/$(prefix)/bin/rplconvert$(EXEEXT)
+	cp $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+			$(top_builddir)/debian/$(prefix)/bin/rplpp$(EXEEXT)
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/include
-	for i in librpl.h rplconfig.h rpl.h rpltypes.h librplprototypes.h \
-			rplexternals.h rpl.inc; \
-	do cp -f $(prefix)/include/$$i $(top_builddir)/debian/$(prefix)/include; \
+	for i in $(srcdir)/src/librpl.h $(top_builddir)/rplconfig.h \
+		$(srcdir)/src/rpl.h $(srcdir)/src/rpltypes.h \
+			$(top_builddir)/src/librplprototypes.h \
+			$(srcdir)/src/rplexternals.h $(top_builddir)/src/rpl.inc; \
+	do cp -f $$i $(top_builddir)/debian/$(prefix)/include; \
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/lib
-	cp -f $(prefix)/lib/librpl.a $(top_builddir)/debian/$(prefix)/lib
+	cp -f $(top_builddir)/src/librpl.a $(top_builddir)/debian/$(prefix)/lib
 	for j in man/man1 man/fr_FR/man1; \
 	do \
 		$(MKDIR_P) $(top_builddir)/debian/$(prefix)/$$j; \
-		for i in gpp.1 mkrplso.1 rpl.1 rplcc.1 rpllink.1 rplpp.1 rpltags.1; \
+		for i in $(top_builddir)/$$j/gpp.1 $(top_builddir)/$$j/mkrplso.1 \
+				$(top_builddir)/$$j/rpl.1 $(top_builddir)/$$j/rplcc.1 \
+				$(top_builddir)/$$j/rpllink.1 $(top_builddir)/$$j/rplpp.1 \
+				$(top_builddir)/$$j/rpltags.1; \
 		do \
-			if [ -f $(prefix)/$$j/$$i ]; then \
-				cp -f $(prefix)/$$j/$$i $(top_builddir)/debian/$(prefix)/$$j; \
+			if [ -f $$i ]; then \
+				cp -f $$i $(top_builddir)/debian/$(prefix)/$$j; \
 			fi; \
 		done; \
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share
-	for i in rplfiles.mgc rplunits; \
-	do cp -f $(prefix)/share/$$i $(top_builddir)/debian/$(prefix)/share; \
-	done
-	if [ -e $(prefix)/bin/gnuplot$(EXEEXT) ]; then \
-		$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share/gnuplot; \
-		cp -fR $(prefix)/share/gnuplot/* \
-				$(top_builddir)/debian/$(prefix)/share/gnuplot; \
-		$(MKDIR_P) $(top_builddir)/debian/$(prefix)/libexec/gnuplot; \
-		cp -fR $(prefix)/share/gnuplot/* \
-				$(top_builddir)/debian/$(prefix)/libexec/gnuplot; \
-		cp -f $(prefix)/bin/gnuplot$(EXEEXT) \
-				$(top_builddir)/debian/$(prefix)/bin; \
-		cp -f $(prefix)/man/man1/gnuplot.1 \
-				$(top_builddir)/debian/$(prefix)/man/man1; \
-	fi;
+	cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \
+			$(top_builddir)/debian/$(prefix)/share
+	cp -f $(srcdir)/tools/@UNITS@/units.dat \
+			$(top_builddir)/debian/$(prefix)/share
+# À faire : s'occuper de gnuplot
 	$(MKDIR_P) $(top_builddir)/debian/DEBIAN
 	cp -f $(top_builddir)/DEBIAN/* $(top_builddir)/debian/DEBIAN
 	(cd  $(top_builddir) && dpkg-deb --build debian debian)