diff --git a/Makefile b/Makefile
index 9a6d614227..544e6b6f20 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ run_sitl :
$(PAPARAZZI_HOME)/var/$(AIRCRAFT)/sim/simsitl
install :
- ./Makefile.pl -install -destdir $(DESTDIR)
+ make -f conf/Makefile.install PREFIX=$(PREFIX)
uninstall :
./Makefile.pl -uninstall -destdir $(DESTDIR)
diff --git a/Makefile.pl b/Makefile.pl
index c9a1bdea36..e67c0bd32b 100755
--- a/Makefile.pl
+++ b/Makefile.pl
@@ -63,10 +63,22 @@ sub read_xml {
my $dirname=$dir->getAttribute('name');
opendir(DIR,$dirname);
my @dir_files = grep { -f "$dirname/$_" } readdir(DIR);
+ foreach my $foo (@dir_files) { print "$foo\n"; }
+
+
map { s#^(.*)#$dirname/$1# } @dir_files;
closedir(DIR);
- push @{$file_a}, @dir_files;
+ foreach my $file (@dir_files) {
+ push @{$file_a}, [$file, $file];
+ }
}
push @sections, [$dest_loc, $file_a];
}
}
+
+sub read_fs_dir {
+# my (
+
+
+
+}
diff --git a/conf/Makefile.install b/conf/Makefile.install
new file mode 100644
index 0000000000..c0f6742ed5
--- /dev/null
+++ b/conf/Makefile.install
@@ -0,0 +1,44 @@
+
+PREFIX=/usr
+DESTDIR=$(PREFIX)/share/paparazzi
+
+install: install_data install_conf install_libs install_bin
+
+
+install_demo:
+ cp -a var/Twin1 $(DESTDIR)/var
+ cp -a var/Twin2 $(DESTDIR)/var
+ cp -a var/Twin3 $(DESTDIR)/var
+
+install_data:
+ install -d $(DESTDIR)/data/maps
+ install -t $(DESTDIR)/data/maps data/maps/*.xml
+ install -t $(DESTDIR)/data/maps data/maps/*.gif
+ install -d $(DESTDIR)/data/pictures
+ install -t $(DESTDIR)/data/pictures data/pictures/*.gif
+ install -t $(DESTDIR)/data/pictures data/pictures/*.svg
+ install -t $(DESTDIR)/data/pictures data/pictures/*.jpg
+
+install_conf:
+ install -d $(DESTDIR)/conf
+ install conf/conf.xml.example $(DESTDIR)/conf/conf.xml
+ install conf/control_panel.xml.example $(DESTDIR)/conf/control_panel.xml
+ install conf/messages.xml $(DESTDIR)/conf/
+ install conf/messages.dtd $(DESTDIR)/conf/
+ install conf/gui.xml $(DESTDIR)/conf/
+
+install_bin:
+ install -d $(PREFIX)/bin/
+ install sw/supervision/paparazzi.pl $(PREFIX)/bin/
+ install -d $(DESTDIR)/bin/
+ install sw/ground_segment/cockpit/map2d $(DESTDIR)/bin/
+ install sw/simulator/gaia $(DESTDIR)/bin/
+ install sw/simulator/simsitl.pl $(DESTDIR)/bin/
+ install sw/ground_segment/cockpit/cockpit.pl $(DESTDIR)/bin/
+ install sw/ground_segment/tmtc/server $(DESTDIR)/bin/
+
+install_libs:
+ install -d $(PREFIX)/lib/perl5/Paparazzi
+ install sw/lib/perl/Paparazzi/*.pm $(PREFIX)/lib/perl5/Paparazzi
+ install sw/supervision/Paparazzi/*.pm $(PREFIX)/lib/perl5/Paparazzi
+ install sw/ground_segment/cockpit/Paparazzi/*.pm $(PREFIX)/lib/perl5/Paparazzi
\ No newline at end of file
diff --git a/conf/control_panel.xml.example b/conf/control_panel.xml.example
index 3cb878bb76..155e089bbb 100644
--- a/conf/control_panel.xml.example
+++ b/conf/control_panel.xml.example
@@ -13,33 +13,28 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
-
+
@@ -49,14 +44,14 @@
-
+
-
+
-
+
@@ -79,82 +74,16 @@
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/conf/install.xml b/conf/install.xml
index c7e5e61285..74df957e19 100644
--- a/conf/install.xml
+++ b/conf/install.xml
@@ -4,264 +4,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/debian/rules b/debian/rules
index b488190f9c..1e7d9107ee 100644
--- a/debian/rules
+++ b/debian/rules
@@ -55,8 +55,8 @@ install: build
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/ivy-ocaml.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/paparazzi
+ # Add here commands to install the package.
+ $(MAKE) install PREFIX=$(CURDIR)/debian/paparazzi/usr
# Build architecture-independent files here.
@@ -82,7 +82,7 @@ binary-arch: build install
# dh_installinfo
dh_installman
dh_link
- dh_strip
+# dh_strip
dh_compress
dh_fixperms
# dh_perl
diff --git a/sw/lib/perl/Paparazzi/Environment.pm b/sw/lib/perl/Paparazzi/Environment.pm
index ad6ea62e58..44314f412c 100644
--- a/sw/lib/perl/Paparazzi/Environment.pm
+++ b/sw/lib/perl/Paparazzi/Environment.pm
@@ -13,7 +13,12 @@ if (defined $ENV{PAPARAZZI_SRC}) {
$paparazzi_src = $ENV{PAPARAZZI_SRC};
$paparazzi_home = $ENV{PAPARAZZI_SRC};
}
-$paparazzi_home = $ENV{PAPARAZZI_HOME} if (defined $ENV{PAPARAZZI_HOME});
+if (defined $ENV{PAPARAZZI_HOME}) {
+ $paparazzi_home = $ENV{PAPARAZZI_HOME}
+}
+else {
+ $paparazzi_home = "/usr/share/paparazzi" unless defined $ENV{PAPARAZZI_SRC};
+}
#print "\nEnvironment : ";
#if (defined $paparazzi_src) {
# print "source directory mode\n paparazzi_src $paparazzi_src\n";
@@ -21,7 +26,7 @@ $paparazzi_home = $ENV{PAPARAZZI_HOME} if (defined $ENV{PAPARAZZI_HOME});
#else {
# print "system mode\n inst_prefix INST_PREFIX";
#}
-#print " paparazzi_home $paparazzi_home\n\n";
+print " paparazzi_home $paparazzi_home\n\n";
sub set_env {
diff --git a/sw/supervision/paparazzi.pl b/sw/supervision/paparazzi.pl
index 65a78c3396..2b2c3d7669 100755
--- a/sw/supervision/paparazzi.pl
+++ b/sw/supervision/paparazzi.pl
@@ -7,7 +7,7 @@ BEGIN {
$ENV{PAPARAZZI_SRC}."/sw/lib/perl" : "/usr/lib/paparazzi/";
}
use lib ($paparazzi_lib);
-use lib ($ENV{PAPARAZZI_SRC}."/sw/supervision");
+#use lib ($ENV{PAPARAZZI_SRC}."/sw/supervision");
use Paparazzi::CpGui;
@ISA = qw(Paparazzi::CpGui);
@@ -29,7 +29,7 @@ sub populate {
Paparazzi::Environment::check_paparazzi_home();
$args->{-config_file} = $paparazzi_home."/conf/control_panel.xml";
$args->{-variables} = {paparazzi_home => $paparazzi_home};
- $args->{-bin_base_dir} = $paparazzi_src;
+ $args->{-bin_base_dir} = defined $paparazzi_src ? $paparazzi_src : "/usr/share/paparazzi";
$args->{-logo_file} = $paparazzi_home."/data/pictures/penguin_logo.gif";
$self->SUPER::populate($args);
$self->configspec(-variables => [S_SUPER, S_SUPER, S_SUPER, S_SUPER, S_SUPER, {}]);