From 36ec367d2c3e06aeb19bb674c7dc06b070f0bcd1 Mon Sep 17 00:00:00 2001
From: Brandon Heller <brandonh@stanford.edu>
Date: Tue, 25 Nov 2008 07:51:51 -0800
Subject: [PATCH] fix paths referencing include/openflow.h, which was moved to
 include/openflow/openflow.h

---
 doc/of-spec/make_latex_input.pl     | 2 +-
 regress/lib/Perl5/OF/OFPacketLib.pm | 2 +-
 regress/lib/Perl5/OF/OFUtil.pm      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/of-spec/make_latex_input.pl b/doc/of-spec/make_latex_input.pl
index 2febda3..4ef4483 100755
--- a/doc/of-spec/make_latex_input.pl
+++ b/doc/of-spec/make_latex_input.pl
@@ -63,7 +63,7 @@ foreach my $type ('enum', 'struct', 'define') {
  mkdir $type;
 }
 
-open(INFILE, "<../../include/openflow.h");
+open(INFILE, "<../../include/openflow/openflow.h");
 
 my $last_comment;
 while(<INFILE>)
diff --git a/regress/lib/Perl5/OF/OFPacketLib.pm b/regress/lib/Perl5/OF/OFPacketLib.pm
index 18debea..d26f84f 100644
--- a/regress/lib/Perl5/OF/OFPacketLib.pm
+++ b/regress/lib/Perl5/OF/OFPacketLib.pm
@@ -155,7 +155,7 @@ $ofp->configure(ByteOrder => 'BigEndian');
 check_OF_vars_set();
 
 # load C structs and enums
-my $of_file = $ENV{'OF_ROOT'}.'/include/openflow.h';
+my $of_file = $ENV{'OF_ROOT'}.'/include/openflow/openflow.h';
 #print "$of_file\n";
 
 eval { $ofp->parse_file($of_file) };
diff --git a/regress/lib/Perl5/OF/OFUtil.pm b/regress/lib/Perl5/OF/OFUtil.pm
index 50d3ac8..0a8f03f 100644
--- a/regress/lib/Perl5/OF/OFUtil.pm
+++ b/regress/lib/Perl5/OF/OFUtil.pm
@@ -66,7 +66,7 @@ my $nf2_kernel_module_name_no_ext = 'hwtable_nf2_mod';
 my $nf2_kernel_module_name        = $nf2_kernel_module_name_no_ext . '.ko';
 my $openflow_dir                  = $ENV{OF_ROOT};
 
-if (! -e "$openflow_dir/include/openflow.h") {
+if (! -e "$openflow_dir/include/openflow/openflow.h") {
 	die "please set OF_ROOT in path so that OFUtil.pm can extract constants"
 }